Remove pytest_django_test.compat.patterns

Author: blueyed

pytest_django_test/compat.py

@@ -1,13 +1,4 @@
 try:
-    from urllib2 import urlopen, HTTPError  # noqa
+    from urllib2 import urlopen, HTTPError
 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
+    from urllib.request import urlopen, HTTPError  # noqa: F401

pytest_django_test/urls.py

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

pytest_django_test/urls_overridden.py

@@ -1,8 +1,6 @@
 from django.conf.urls import url
 from django.http import HttpResponse
 
-from .compat import patterns
-
-urlpatterns = patterns(
-    "", url(r"^overridden_url/$", lambda r: HttpResponse("Overridden urlconf works!"))
-)
+urlpatterns = [
+    url(r"^overridden_url/$", lambda r: HttpResponse("Overridden urlconf works!"))
+]

tests/test_environment.py

@@ -58,14 +58,10 @@ def test_invalid_template_variable(django_testdir):
     django_testdir.create_app_file(
         """
         from django.conf.urls import url
-        from pytest_django_test.compat import patterns
 
         from tpkg.app import views
 
-        urlpatterns = patterns(
-            '',
-            url(r'invalid_template/', views.invalid_template),
-        )
+        urlpatterns = [url(r'invalid_template/', views.invalid_template)]
         """,
         "urls.py",
     )
@@ -168,14 +164,10 @@ def test_invalid_template_variable_opt_in(django_testdir):
     django_testdir.create_app_file(
         """
         from django.conf.urls import url
-        from pytest_django_test.compat import patterns
 
         from tpkg.app import views
 
-        urlpatterns = patterns(
-            '',
-            url(r'invalid_template/', views.invalid_template),
-        )
+        urlpatterns = [url(r'invalid_template/', views.invalid_template)]
         """,
         "urls.py",
     )

tests/test_fixtures.py

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

tests/test_urls.py

@@ -23,12 +23,11 @@ def test_urls_cache_is_cleared(testdir):
     testdir.makepyfile(
         myurls="""
         from django.conf.urls import url
-        from pytest_django_test.compat import patterns
 
         def fake_view(request):
             pass
 
-        urlpatterns = patterns('', url(r'first/$', fake_view, name='first'))
+        urlpatterns = [url(r'first/$', fake_view, name='first')]
     """
     )
 
@@ -60,24 +59,22 @@ def test_urls_cache_is_cleared_and_new_urls_can_be_assigned(testdir):
     testdir.makepyfile(
         myurls="""
         from django.conf.urls import url
-        from pytest_django_test.compat import patterns
 
         def fake_view(request):
             pass
 
-        urlpatterns = patterns('', url(r'first/$', fake_view, name='first'))
+        urlpatterns = [url(r'first/$', fake_view, name='first')]
     """
     )
 
     testdir.makepyfile(
         myurls2="""
         from django.conf.urls import url
-        from pytest_django_test.compat import patterns
 
         def fake_view(request):
             pass
 
-        urlpatterns = patterns('', url(r'second/$', fake_view, name='second'))
+        urlpatterns = [url(r'second/$', fake_view, name='second')]
     """
     )