Django 1.10 compat: Do not use django.conf.urls.patterns

Author: pelme

pytest_django_test/compat.py

@@ -8,3 +8,11 @@
     from urllib2 import urlopen, HTTPError  # noqa
 except ImportError:
     from urllib.request import urlopen, HTTPError  # noqa
+
+# Django 1.10 removes patterns, instead it is just a list
+try:
+    from django.conf.urls import patterns
+except ImportError:
+    def patterns(prefix, *urls):
+        assert prefix == ''
+        return urls

pytest_django_test/urls.py

@@ -1,7 +1,10 @@
-from django.conf.urls import patterns
+from django.conf.urls import url
+
+from .app import views
+from .compat import patterns
 
 urlpatterns = patterns(
     '',
-    (r'^item_count/$', 'pytest_django_test.app.views.item_count'),
-    (r'^admin-required/$', 'pytest_django_test.app.views.admin_required_view'),
+    url(r'^item_count/$', views.item_count),
+    url(r'^admin-required/$', views.admin_required_view),
 )

pytest_django_test/urls_overridden.py

@@ -1,7 +1,8 @@
-from django.conf.urls import patterns, url
-
+from django.conf.urls import url
 from django.http import HttpResponse
 
+from .compat import patterns
+
 urlpatterns = patterns(
     '',
     url(r'^overridden_url/$',

tests/test_environment.py

@@ -37,11 +37,14 @@ def test_mail_again():
     """)
 def test_invalid_template_variable(django_testdir):
     django_testdir.create_app_file("""
-        from django.conf.urls import patterns
+        from django.conf.urls import url
+        from pytest_django_test.compat import patterns
+
+        from tpkg.app import views
 
         urlpatterns = patterns(
             '',
-            (r'invalid_template/', 'tpkg.app.views.invalid_template'),
+            url(r'invalid_template/', views.invalid_template),
         )
         """, 'urls.py')
     django_testdir.create_app_file("""
@@ -81,11 +84,14 @@ def test_ignore(client):
     """)
 def test_invalid_template_variable_opt_in(django_testdir):
     django_testdir.create_app_file("""
-        from django.conf.urls import patterns
+        from django.conf.urls import url
+        from pytest_django_test.compat import patterns
+
+        from tpkg.app import views
 
         urlpatterns = patterns(
             '',
-            (r'invalid_template/', 'tpkg.app.views.invalid_template'),
+            url(r'invalid_template/', views.invalid_template),
         )
         """, 'urls.py')
     django_testdir.create_app_file("""

tests/test_fixtures.py

@@ -222,11 +222,13 @@ class MyCustomUser(AbstractUser):
             USERNAME_FIELD = 'identifier'
         """, 'models.py')
     django_testdir.create_app_file("""
-        from django.conf.urls import patterns
+        from django.conf.urls import url
+        from pytest_django_test.compat import patterns
+        from tpkg.app import views
 
         urlpatterns = patterns(
             '',
-            (r'admin-required/', 'tpkg.app.views.admin_required_view'),
+            url(r'admin-required/', views.admin_required_view),
         )
         """, 'urls.py')
     django_testdir.create_app_file("""