Remove pre-Django 1.8 compatibility code

Author: medmunds

anymail/models.py

@@ -3,7 +3,11 @@
 # python runtests.py [anymail.tests.test_x anymail.tests.test_y.SomeTestCase ...]
 
 import sys
+
+from django import setup
 from django.conf import settings
+from django.test.runner import DiscoverRunner as TestRunner
+
 
 APP = 'anymail'
 
@@ -37,17 +41,8 @@
     ],
 )
 
-try:
-    # Django 1.7+ initialize app registry
-    from django import setup
-    setup()
-except ImportError:
-    pass
-
-try:
-    from django.test.runner import DiscoverRunner as TestRunner  # Django 1.6+
-except ImportError:
-    from django.test.simple import DjangoTestSuiteRunner as TestRunner  # Django -1.5
+# Initialize Django app registry
+setup()
 
 
 def runtests(*args):

runtests.py

@@ -1,18 +0,0 @@
-# Exposing all TestCases at the 'tests' module level
-# is required by the old (<=1.5) DjangoTestSuiteRunner.
-
-from .test_mailgun_backend import *
-from .test_mailgun_integration import *
-
-from .test_mandrill_backend import *
-from .test_mandrill_integration import *
-
-from .test_postmark_backend import *
-from .test_postmark_integration import *
-
-from .test_sendgrid_backend import *
-from .test_sendgrid_webhooks import *
-from .test_sendgrid_integration import *
-
-# Djrill leftovers:
-from .test_mandrill_djrill_features import *

tests/__init__.py

@@ -111,15 +111,9 @@ def test_html_only_message(self):
         self.assertEqual(data['html'], html_content)
 
     def test_reply_to(self):
-        # reply_to is new in Django 1.8 -- before that, you can simply include it in headers
-        try:
-            # noinspection PyArgumentList
-            email = mail.EmailMessage('Subject', 'Body goes here', '[email protected]', ['[email protected]'],
-                                      reply_to=['[email protected]', 'Other <[email protected]>'],
-                                      headers={'X-Other': 'Keep'})
-        except TypeError:
-            # Pre-Django 1.8
-            return self.skipTest("Django version doesn't support EmailMessage(reply_to)")
+        email = mail.EmailMessage('Subject', 'Body goes here', '[email protected]', ['[email protected]'],
+                                  reply_to=['[email protected]', 'Other <[email protected]>'],
+                                  headers={'X-Other': 'Keep'})
         email.send()
         data = self.get_api_call_data()
         self.assertEqual(data['h:Reply-To'], '[email protected], Other <[email protected]>')

tests/test_mailgun_backend.py

@@ -132,15 +132,9 @@ def test_html_only_message(self):
         self.assertEqual(data['message']['html'], html_content)
 
     def test_reply_to(self):
-        # reply_to is new in Django 1.8 -- before that, you can simply include it in headers
-        try:
-            # noinspection PyArgumentList
-            email = mail.EmailMessage('Subject', 'Body goes here', '[email protected]', ['[email protected]'],
-                                      reply_to=['[email protected]', 'Other <[email protected]>'],
-                                      headers={'X-Other': 'Keep'})
-        except TypeError:
-            # Pre-Django 1.8
-            raise unittest.SkipTest("Django version doesn't support EmailMessage(reply_to)")
+        email = mail.EmailMessage('Subject', 'Body goes here', '[email protected]', ['[email protected]'],
+                                  reply_to=['[email protected]', 'Other <[email protected]>'],
+                                  headers={'X-Other': 'Keep'})
         email.send()
         data = self.get_api_call_json()
         self.assertEqual(data['message']['headers']['Reply-To'],

tests/test_mandrill_backend.py

@@ -130,15 +130,9 @@ def test_extra_headers_serialization_error(self):
             self.message.send()
 
     def test_reply_to(self):
-        # reply_to is new in Django 1.8 -- before that, you can simply include it in headers
-        try:
-            # noinspection PyArgumentList
-            email = mail.EmailMessage('Subject', 'Body goes here', '[email protected]', ['[email protected]'],
-                                      reply_to=['[email protected]', 'Other <[email protected]>'],
-                                      headers={'X-Other': 'Keep'})
-        except TypeError:
-            # Pre-Django 1.8
-            return self.skipTest("Django version doesn't support EmailMessage(reply_to)")
+        email = mail.EmailMessage('Subject', 'Body goes here', '[email protected]', ['[email protected]'],
+                                  reply_to=['[email protected]', 'Other <[email protected]>'],
+                                  headers={'X-Other': 'Keep'})
         email.send()
         data = self.get_api_call_json()
         self.assertEqual(data['ReplyTo'], '[email protected], Other <[email protected]>')

tests/test_postmark_backend.py

@@ -169,15 +169,9 @@ def test_extra_headers_serialization_error(self):
             self.message.send()
 
     def test_reply_to(self):
-        # reply_to is new in Django 1.8 -- before that, you can simply include it in headers
-        try:
-            # noinspection PyArgumentList
-            email = mail.EmailMessage('Subject', 'Body goes here', '[email protected]', ['[email protected]'],
-                                      reply_to=['[email protected]', 'Other <[email protected]>'],
-                                      headers={'X-Other': 'Keep'})
-        except TypeError:
-            # Pre-Django 1.8
-            return self.skipTest("Django version doesn't support EmailMessage(reply_to)")
+        email = mail.EmailMessage('Subject', 'Body goes here', '[email protected]', ['[email protected]'],
+                                  reply_to=['[email protected]', 'Other <[email protected]>'],
+                                  headers={'X-Other': 'Keep'})
         email.send()
         data = self.get_api_call_data()
         self.assertNotIn('replyto', data)  # don't use SendGrid's replyto (it's broken); just use headers