Add support for Python 3.7 and Django 2.1. Remove old code for Django < 1.3. Bump version.

sastred · sastred · commit 12b78681f078 · 2018-11-28T12:24:15.000+01:00
diff --git a/README.rst b/README.rst
@@ -81,6 +81,7 @@ You can read the package documentation at http://django-yubin.readthedocs.org/en
 
 Changelog
 ---------
+* 1.3.0       Allow to send emails inmediatly without being saved in database (priority «now-not-queue»). Add support for Python 3.7 and Django 2.1. Remove old code for Django < 1.3.
 * 1.2.0       Fix is_base64 detection. Add a «send_test_email» command to check connection parameters. New health check view. Don't open a connection if there are no messages in queue to send. Add a "date_sent" field to detect when the mail was sent.
 * 1.1.0       Fix attachment headers in TemplateAttachmentEmailMessagView making both "attachment" and "filename" args mandatory.
 * 1.0.5       Add missing paths in MANIFEST.in.
diff --git a/django_yubin/__init__.py b/django_yubin/__init__.py
@@ -115,14 +115,11 @@ def queue_email_message(email_message, fail_silently=False, priority=None):
                                               settings.MAILER_TEST_EMAIL)
 
     if priority == constants.PRIORITY_NOW_NOT_QUEUED:
-        if constants.EMAIL_BACKEND_SUPPORT:
-            from django.core.mail import get_connection
-            from django_yubin.engine import send_message
-            connection = get_connection(backend=settings.USE_BACKEND)
-            result = send_message(email_message, smtp_connection=connection)
-            return (result == constants.RESULT_SENT)
-        else:
-            return email_message.send()
+        from django.core.mail import get_connection
+        from django_yubin.engine import send_message
+        connection = get_connection(backend=settings.USE_BACKEND)
+        result = send_message(email_message, smtp_connection=connection)
+        return (result == constants.RESULT_SENT)
 
     count = 0
     for to_email in email_message.recipients():
diff --git a/django_yubin/constants.py b/django_yubin/constants.py
@@ -24,10 +24,3 @@
 }
 
 PRIORITY_HEADER = 'X-Mail-Queue-Priority'
-
-try:
-    from django.core.mail import get_connection  # noqa:F401
-    EMAIL_BACKEND_SUPPORT = True
-except ImportError:
-    # Django version < 1.2
-    EMAIL_BACKEND_SUPPORT = False
diff --git a/django_yubin/engine.py b/django_yubin/engine.py
@@ -8,6 +8,7 @@
 Methods here actually handle the sending of queued messages.
 
 """
+from django.core.mail import get_connection
 from django.utils.encoding import smart_str
 from django.utils.timezone import now
 from django_yubin import constants, models, settings
@@ -24,11 +25,6 @@
 
 logger = logging.getLogger('django_yubin.engine')
 
-if constants.EMAIL_BACKEND_SUPPORT:
-    from django.core.mail import get_connection
-else:
-    from django.core.mail import SMTPConnection as get_connection
-    logger.warn('DEPRECATION WARNING. Support for Django<1.3 would be removed')
 
 LOCK_PATH = settings.LOCK_PATH or os.path.join(tempfile.gettempdir(),
                                                'send_mail')
@@ -109,10 +105,7 @@ def send_all(block_size=500, backend=None, messages=None, message_limit=0):
             logger.info('No messages in queue.')
             return
 
-        if constants.EMAIL_BACKEND_SUPPORT:
-            connection = get_connection(backend=backend)
-        else:
-            connection = get_connection()
+        connection = get_connection(backend=backend)
         blacklist = models.Blacklist.objects.values_list('email', flat=True)
         connection.open()
         for message in messages_list:
diff --git a/docs/install.rst b/docs/install.rst
@@ -2,7 +2,7 @@
 Installation
 ============
 
-An obvious prerequisite of django-yubin is Django - 1.3 is the
+An obvious prerequisite of django-yubin is Django - 1.9 is the
 minimum supported version.
 
 
diff --git a/docs/queue.rst b/docs/queue.rst
@@ -8,7 +8,7 @@ need to periodically tell it to clear the queue and actually send the mail.
 The latter is done via a command extension.
 
 
-Putting Mail On The Queue (Django 1.3 or higher)
+Putting Mail On The Queue
 =================================================
 
 In settings.py, configure Django's EMAIL_BACKEND setting like so:
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
 
 setup(
     name='django-yubin',
-    version='1.2.0',
+    version='1.3.0',
     description=("A reusable Django app for composing and queueing emails "
                  "Adds django-mailer2 + django-mailviews + others"),
     long_description=long_description,
@@ -52,10 +52,12 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Framework :: Django',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
     ]
 )
diff --git a/tests/tests/test_backend.py b/tests/tests/test_backend.py
@@ -7,79 +7,67 @@
 from django.conf import settings as django_settings
 from django.core import mail
 
-from django_yubin import models, constants, queue_email_message, settings, mail_admins, mail_managers
+from django_yubin import models, constants, settings, mail_admins, mail_managers
 
 from .base import MailerTestCase, RFC_6532_SUPPORT
 
 
 class TestBackend(MailerTestCase):
     """
     Backend tests for the django_yubin app.
-
-    For Django versions less than 1.2, these tests are still run but they just
-    use the queue_email_message funciton rather than directly sending messages.
-
     """
 
     def setUp(self):
         super(TestBackend, self).setUp()
-        if constants.EMAIL_BACKEND_SUPPORT:
-            if hasattr(django_settings, 'EMAIL_BACKEND'):
-                self.old_email_backend = django_settings.EMAIL_BACKEND
-            else:
-                self.old_email_backend = None
-            django_settings.EMAIL_BACKEND = 'django_yubin.smtp_queue.'\
-                                            'EmailBackend'
+        if hasattr(django_settings, 'EMAIL_BACKEND'):
+            self.old_email_backend = django_settings.EMAIL_BACKEND
+        else:
+            self.old_email_backend = None
+        django_settings.EMAIL_BACKEND = 'django_yubin.smtp_queue.'\
+                                        'EmailBackend'
 
     def tearDown(self):
         super(TestBackend, self).tearDown()
-        if constants.EMAIL_BACKEND_SUPPORT:
-            if self.old_email_backend:
-                django_settings.EMAIL_BACKEND = self.old_email_backend
-            else:
-                delattr(django_settings, 'EMAIL_BACKEND')
-
-    def send_message(self, msg):
-        if constants.EMAIL_BACKEND_SUPPORT:
-            msg.send()
+        if self.old_email_backend:
+            django_settings.EMAIL_BACKEND = self.old_email_backend
         else:
-            queue_email_message(msg)
+            delattr(django_settings, 'EMAIL_BACKEND')
 
     def testQueuedMessagePriorities(self):
         # now_not_queued priority message
         msg = mail.EmailMessage(subject='subject', body='body',
                                 from_email='mail_from@abc.com', to=['mail_to@abc.com'],
                                 headers={'X-Mail-Queue-Priority': 'now-not-queued'})
-        self.send_message(msg)
+        msg.send()
 
         # now priority message
         msg = mail.EmailMessage(subject='subject', body='body',
                                 from_email='mail_from@abc.com', to=['mail_to@abc.com'],
                                 headers={'X-Mail-Queue-Priority': 'now'})
-        self.send_message(msg)
+        msg.send()
 
         # high priority message
         msg = mail.EmailMessage(subject='subject', body='body',
                                 from_email='mail_from@abc.com', to=['mail_to@abc.com'],
                                 headers={'X-Mail-Queue-Priority': 'high'})
-        self.send_message(msg)
+        msg.send()
 
         # low priority message
         msg = mail.EmailMessage(subject='subject', body='body',
                                 from_email='mail_from@abc.com', to=['mail_to@abc.com'],
                                 headers={'X-Mail-Queue-Priority': 'low'})
-        self.send_message(msg)
+        msg.send()
 
         # normal priority message
         msg = mail.EmailMessage(subject='subject', body='body',
                                 from_email='mail_from@abc.com', to=['mail_to@abc.com'],
                                 headers={'X-Mail-Queue-Priority': 'normal'})
-        self.send_message(msg)
+        msg.send()
 
         # normal priority message (no explicit priority header)
         msg = mail.EmailMessage(subject='subject', body='body',
                                 from_email='mail_from@abc.com', to=['mail_to@abc.com'])
-        self.send_message(msg)
+        msg.send()
 
         qs = models.Message.objects.all()
         self.assertEqual(qs.count(), 5)
@@ -113,9 +101,9 @@ def testUnicodeQueuedMessage(self):
         """
         from django.core.management import call_command
         msg = mail.EmailMessage(subject='subject', body='body',
-                        from_email=u'juan.lópez@abc.com', to=['mail_to@abc.com'],
-                        headers={'X-Mail-Queue-Priority': 'normal'})
-        self.send_message(msg)
+                                from_email=u'juan.lópez@abc.com', to=['mail_to@abc.com'],
+                                headers={'X-Mail-Queue-Priority': 'normal'})
+        msg.send()
         queued_messages = models.QueuedMessage.objects.all()
         self.assertEqual(queued_messages.count(), 1)
         call_command('send_mail', verbosity='0')
@@ -131,9 +119,9 @@ def testUnicodePriorityMessage(self):
         """
         from django.core.management import call_command
         msg = mail.EmailMessage(subject=u'á subject', body='body',
-                        from_email=u'juan.lópez@abc.com', to=[u'únñac@abc.com'],
-                        headers={'X-Mail-Queue-Priority': 'now'})
-        self.send_message(msg)
+                                from_email=u'juan.lópez@abc.com', to=[u'únñac@abc.com'],
+                                headers={'X-Mail-Queue-Priority': 'now'})
+        msg.send()
         queued_messages = models.QueuedMessage.objects.all()
         self.assertEqual(queued_messages.count(), 1)
         call_command('send_mail', verbosity='0')
@@ -143,9 +131,9 @@ def testUnicodePriorityMessage(self):
     def testSendMessageNowPriority(self):
         # NOW priority message
         msg = mail.EmailMessage(subject='subject', body='body',
-                        from_email='mail_from@abc.com', to=['mail_to@abc.com'],
-                        headers={'X-Mail-Queue-Priority': 'now'})
-        self.send_message(msg)
+                                from_email='mail_from@abc.com', to=['mail_to@abc.com'],
+                                headers={'X-Mail-Queue-Priority': 'now'})
+        msg.send()
 
         queued_messages = models.QueuedMessage.objects.all()
         self.assertEqual(queued_messages.count(), 0)
@@ -156,7 +144,7 @@ def testSendMessageTestMode(self):
         settings.MAILER_TEST_EMAIL = 'test_email@abc.com'
         msg = mail.EmailMessage(subject='subject', body='body',
                                 from_email='mail_from@abc.com', to=['mail_to@abc.com'])
-        self.send_message(msg)
+        msg.send()
 
         queued_messages = models.QueuedMessage.objects.all()
 
@@ -193,7 +181,6 @@ def testSendMessageManagersTestMode(self):
         self.assertTrue('X-Yubin-Test-Original: {}'.format(','.join(recipient_list)) in
                         queued_messages[0].message.encoded_message)
 
-
     def testHighPriority(self):
         self.assertEqual(models.QueuedMessage.objects.all().count(), 0)
         self.assertEqual(models.Message.objects.all().count(), 0)
@@ -202,7 +189,7 @@ def testHighPriority(self):
         # Test with default priority
         msg = mail.EmailMessage(subject='subject 1', body='body',
                                 from_email='mail_from@abc.com', to=['mail_to@abc.com'])
-        self.send_message(msg)
+        msg.send()
 
         self.assertEqual(models.Message.objects.all().count(), 1)
         self.assertEqual(models.QueuedMessage.objects.all().count(), 1)
@@ -212,7 +199,7 @@ def testHighPriority(self):
         msg = mail.EmailMessage(subject='subject 2', body='body',
                                 from_email='mail_from@abc.com', to=['mail_to@abc.com'],
                                 headers={'X-Mail-Queue-Priority': 'now'})
-        self.send_message(msg)
+        msg.send()
 
         self.assertEqual(models.QueuedMessage.objects.all().count(), 1)
         self.assertEqual(models.Message.objects.all().count(), 2)
diff --git a/tests/tests/test_engine.py b/tests/tests/test_engine.py
@@ -106,13 +106,12 @@ class SendMessageTest(MailerTestCase):
     def setUp(self):
         # Set EMAIL_BACKEND
         super(SendMessageTest, self).setUp()
-        if constants.EMAIL_BACKEND_SUPPORT:
-            if hasattr(django_settings, 'EMAIL_BACKEND'):
-                self.old_email_backend = django_settings.EMAIL_BACKEND
-            else:
-                self.old_email_backend = None
-            django_settings.EMAIL_BACKEND = 'django.core.mail.backends.smtp.' \
-                                            'EmailBackend'
+        if hasattr(django_settings, 'EMAIL_BACKEND'):
+            self.old_email_backend = django_settings.EMAIL_BACKEND
+        else:
+            self.old_email_backend = None
+        django_settings.EMAIL_BACKEND = 'django.core.mail.backends.smtp.' \
+                                        'EmailBackend'
 
         # Create somewhere to store the log debug output.
         self.output = StringIO()
@@ -130,11 +129,10 @@ def setUp(self):
     def tearDown(self):
         # Restore EMAIL_BACKEND
         super(SendMessageTest, self).tearDown()
-        if constants.EMAIL_BACKEND_SUPPORT:
-            if self.old_email_backend:
-                django_settings.EMAIL_BACKEND = self.old_email_backend
-            else:
-                delattr(django_settings, 'EMAIL_BACKEND')
+        if self.old_email_backend:
+            django_settings.EMAIL_BACKEND = self.old_email_backend
+        else:
+            delattr(django_settings, 'EMAIL_BACKEND')
 
         # Remove the log handler.
         logger = logging.getLogger('django_yubin')
diff --git a/tox.ini b/tox.ini
@@ -13,6 +13,10 @@ envlist =
     py34-dj20
     py35-dj20
     py36-dj20
+    py37-dj20
+    py35-dj21
+    py36-dj21
+    py37-dj21
 skip_missing_interpreters = true
 
 
@@ -24,6 +28,7 @@ deps =
     dj110: Django>=1.10,<1.11
     dj111: Django>=1.11,<2.0
     dj20: Django>=2.0,<2.1
+    dj21: Django>=2.1,<2.2
 commands=
     coverage run --rcfile={toxinidir}/.coveragerc {toxinidir}/setup.py test
 	coverage report --omit=*test*
