Drop Django 1.3 compatibility code

Author: pelme

pytest_django/live_server_helper.py

@@ -4,13 +4,6 @@
 
 from .lazy_django import get_django_version
 
-
-def supported():
-    import django.test.testcases
-
-    return hasattr(django.test.testcases, 'LiveServerThread')
-
-
 class LiveServer(object):
     """The liveserver fixture
 
@@ -20,11 +13,8 @@ class LiveServer(object):
     """
 
     def __init__(self, addr):
-        try:
-            from django.test.testcases import LiveServerThread
-        except ImportError:
-            pytest.skip('live_server tests not supported in Django < 1.4')
         from django.db import connections
+        from django.test.testcases import LiveServerThread
 
         connections_override = {}
         for conn in connections.all():

pytest_django_test/settings_base.py

@@ -12,8 +12,6 @@
 STATIC_URL = '/static/'
 SECRET_KEY = 'foobar'
 
-SITE_ID = 1234  # Needed for 1.3 compatibility
-
 # Used to construct unique test database names to allow detox to run multiple
 # versions at the same time
 uid = os.getenv('UID', '')

pytest_django_test/urls.py

@@ -1,7 +1,4 @@
-try:
-    from django.conf.urls import patterns  # Django >1.4
-except ImportError:
-    from django.conf.urls.defaults import patterns  # Django 1.3
+from django.conf.urls import patterns
 
 urlpatterns = patterns(
     '',

pytest_django_test/urls_overridden.py

@@ -1,7 +1,4 @@
-try:
-    from django.conf.urls import patterns, url  # Django >1.4
-except ImportError:
-    from django.conf.urls.defaults import patterns, url  # Django 1.3
+from django.conf.urls import patterns, url
 
 from django.http import HttpResponse
 

tests/conftest.py

@@ -63,7 +63,6 @@ def django_testdir(request, testdir, monkeypatch):
             'tpkg.app',
         ]
         SECRET_KEY = 'foobar'
-        SITE_ID = 1234  # Needed for 1.3 compatibility
 
         MIDDLEWARE_CLASSES = (
             'django.contrib.sessions.middleware.SessionMiddleware',

tests/test_environment.py

@@ -40,10 +40,7 @@ def test_mail_again():
     """)
 def test_invalid_template_variable(django_testdir):
     django_testdir.create_app_file("""
-        try:
-            from django.conf.urls import patterns  # Django >1.4
-        except ImportError:
-            from django.conf.urls.defaults import patterns  # Django 1.3
+        from django.conf.urls import patterns
 
         urlpatterns = patterns(
             '',
@@ -90,10 +87,7 @@ def test_ignore(client):
     """)
 def test_invalid_template_variable_opt_in(django_testdir):
     django_testdir.create_app_file("""
-        try:
-            from django.conf.urls import patterns  # Django >1.4
-        except ImportError:
-            from django.conf.urls.defaults import patterns  # Django 1.3
+        from django.conf.urls import patterns
 
         urlpatterns = patterns(
             '',

tests/test_fixtures.py

@@ -85,11 +85,6 @@ def test_deleted_again(self, settings):
 
 
 class TestLiveServer:
-    pytestmark = [
-        pytest.mark.skipif(get_django_version() < (1, 4),
-                           reason="Django > 1.3 required"),
-    ]
-
     def test_url(self, live_server):
         assert live_server.url == force_text(live_server)
 
@@ -227,10 +222,7 @@ class MyCustomUser(AbstractUser):
             USERNAME_FIELD = 'identifier'
         """, 'models.py')
     django_testdir.create_app_file("""
-        try:
-            from django.conf.urls import patterns  # Django >1.4
-        except ImportError:
-            from django.conf.urls.defaults import patterns  # Django 1.3
+        from django.conf.urls import patterns
 
         urlpatterns = patterns(
             '',