Support for Django 5.0 and python 3.12 + Fix CI (#277)

* Upgrade to last Django & Python supported versions

* flake8 fixes

* Add CI

* Add final version of Django 5.0

django_mailbox/tests/test_process_email.py

@@ -1,6 +1,5 @@
 import gzip
 import os.path
-import sys
 
 import copy
 from unittest import mock
@@ -9,7 +8,7 @@ from django_mailbox.models import Mailbox, Message
 from django_mailbox.utils import convert_header_to_unicode
 from django_mailbox import utils
 from django_mailbox.tests.base import EmailMessageTestCase
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.core.mail import EmailMessage
 
 __all__ = ['TestProcessEmail']
@@ -367,12 +366,12 @@ class TestProcessEmail(EmailMessageTestCase):
         email_object = self._get_email_object(
             'message_with_long_content.eml',
         )
-        size = len(force_text(email_object.as_string()))
+        size = len(force_str(email_object.as_string()))
 
         msg = self.mailbox.process_incoming_message(email_object)
 
         self.assertEqual(size,
-                         len(force_text(msg.get_email_object().as_string())))
+                         len(force_str(msg.get_email_object().as_string())))
 
     def test_message_saved(self):
         message = self._get_email_object('generic_message.eml')
@@ -386,7 +385,7 @@ class TestProcessEmail(EmailMessageTestCase):
 
             msg = self.mailbox.process_incoming_message(message)
 
-        self.assertNotEquals(msg.eml, None)
+        self.assertNotEqual(msg.eml, None)
 
         self.assertTrue(msg.eml.name.endswith('.eml'))
 
@@ -408,7 +407,7 @@ class TestProcessEmail(EmailMessageTestCase):
 
             msg = self.mailbox.process_incoming_message(message)
 
-        self.assertEquals(msg.eml, None)
+        self.assertEqual(msg.eml, None)
 
     def test_message_compressed(self):
         message = self._get_email_object('generic_message.eml')

django_mailbox/tests/test_processincomingmessage.py

@@ -1,34 +1,25 @@
-from distutils.version import LooseVersion
 from unittest import mock
 
 from django.core.management import call_command, CommandError
 from django.test import TestCase
-import django
+
 
 class CommandsTestCase(TestCase):
     def test_processincomingmessage_no_args(self):
         """Check that processincomingmessage works with no args"""
-        
+
         mailbox_name = None
         # Mock handle so that the test doesn't hang waiting for input. Note that we are only testing
         # the argument parsing here -- functionality should be tested elsewhere
         with mock.patch('django_mailbox.management.commands.processincomingmessage.Command.handle') as handle:
             # Don't care about the return value
             handle.return_value = None
-            
+
             call_command('processincomingmessage')
             args, kwargs = handle.call_args
 
             # Make sure that we called with the right arguments
-            try:
-                self.assertEqual(kwargs['mailbox_name'], mailbox_name)
-            except KeyError:
-                # Handle Django 1.7
-                # It uses optparse instead of argparse, so instead of being
-                # set to None, mailbox_name is simply left out altogether
-                # Thus we expect an empty tuple here
-                self.assertEqual(args, tuple())
-
+            self.assertEqual(kwargs['mailbox_name'], mailbox_name)
 
     def test_processincomingmessage_with_arg(self):
         """Check that processincomingmessage works with mailbox_name given"""
@@ -37,29 +28,14 @@ class CommandsTestCase(TestCase):
 
         with mock.patch('django_mailbox.management.commands.processincomingmessage.Command.handle') as handle:
             handle.return_value = None
-            
+
             call_command('processincomingmessage', mailbox_name)
             args, kwargs = handle.call_args
-            try:
-                self.assertEqual(kwargs['mailbox_name'], mailbox_name)
-            except (AssertionError, KeyError):
-                # Handle Django 1.7
-                # It uses optparse instead of argparse, so instead of being
-                # in kwargs, mailbox_name is in args
-                self.assertEqual(args[0], mailbox_name)
+
+            self.assertEqual(kwargs['mailbox_name'], mailbox_name)
 
     def test_processincomingmessage_too_many_args(self):
         """Check that processincomingmessage raises an error if too many args"""
-        # Only perform this test for Django versions greater than 1.7.*. This
-        # is because, with optparse, too many arguments doesn't result in an
-        # error, which means this test is worthless anyway
-        # For the "compatibility" versions, unexpected arguments aren't handled
-        # very well, and result in a TypeError
-        if (LooseVersion(django.get_version()) >= LooseVersion('1.8') and
-                LooseVersion(django.get_version()) < LooseVersion('1.10')):
-            with self.assertRaises(TypeError):
-                call_command('processincomingmessage', 'foo_mailbox', 'invalid_arg')
-        # In 1.10 and later a proper CommandError should be raised
-        elif LooseVersion(django.get_version()) >= LooseVersion('1.10'):
-            with self.assertRaises(CommandError):
-                call_command('processincomingmessage', 'foo_mailbox', 'invalid_arg')
+
+        with self.assertRaises(CommandError):
+            call_command('processincomingmessage', 'foo_mailbox', 'invalid_arg')

django_mailbox/tests/test_transports.py

@@ -8,7 +8,7 @@ from django_mailbox.transports import ImapTransport, Pop3Transport
 FAKE_UID_SEARCH_ANSWER = (
     'OK',
     [
-        b'18 19 20 21 22 23 24 25 26 27 28 29 ' + 
+        b'18 19 20 21 22 23 24 25 26 27 28 29 ' +
         b'30 31 32 33 34 35 36 37 38 39 40 41 42 43 44'
     ]
 )