Fixed #22218 -- Deprecated django.conf.urls.patterns.

Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.

17 files changed, 142 insertions, 134 deletions

diff --git a/tests/urlpatterns_reverse/erroneous_urls.py b/tests/urlpatterns_reverse/erroneous_urls.py
index ac6b6f7cb3..213642008d 100644
--- a/tests/urlpatterns_reverse/erroneous_urls.py
+++ b/tests/urlpatterns_reverse/erroneous_urls.py
@@ -1,6 +1,6 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
-urlpatterns = patterns('',
+urlpatterns = [
     # View has erroneous import
     url(r'erroneous_inner/$', 'urlpatterns_reverse.views.erroneous_view'),
     # Module has erroneous import
@@ -13,4 +13,4 @@ urlpatterns = patterns('',
     url(r'missing_outer/$', 'urlpatterns_reverse.missing_module.missing_view'),
     # Regex contains an error (refs #6170)
     url(r'(regex_error/$', 'regressiontestes.urlpatterns_reverse.views.empty_view'),
-)
+]
diff --git a/tests/urlpatterns_reverse/extra_urls.py b/tests/urlpatterns_reverse/extra_urls.py
index 94e225fb46..4eb2f02130 100644
--- a/tests/urlpatterns_reverse/extra_urls.py
+++ b/tests/urlpatterns_reverse/extra_urls.py
@@ -2,14 +2,14 @@
 Some extra URL patterns that are included at the top level.
 """
 
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from .views import empty_view
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^e-places/(\d+)/$', empty_view, name='extra-places'),
     url(r'^e-people/(?P<name>\w+)/$', empty_view, name="extra-people"),
     url('', include('urlpatterns_reverse.included_urls2')),
     url(r'^prefix/(?P<prefix>\w+)/', include('urlpatterns_reverse.included_urls2')),
-)
+]
diff --git a/tests/urlpatterns_reverse/included_named_urls.py b/tests/urlpatterns_reverse/included_named_urls.py
index 14d2525114..d8a6a16481 100644
--- a/tests/urlpatterns_reverse/included_named_urls.py
+++ b/tests/urlpatterns_reverse/included_named_urls.py
@@ -1,11 +1,11 @@
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from .views import empty_view
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^$', empty_view, name="named-url3"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url4"),
     url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
-    (r'^included/', include('urlpatterns_reverse.included_named_urls2')),
-)
+    url(r'^included/', include('urlpatterns_reverse.included_named_urls2')),
+]
diff --git a/tests/urlpatterns_reverse/included_named_urls2.py b/tests/urlpatterns_reverse/included_named_urls2.py
index 897d9e7487..cb8c893b48 100644
--- a/tests/urlpatterns_reverse/included_named_urls2.py
+++ b/tests/urlpatterns_reverse/included_named_urls2.py
@@ -1,10 +1,10 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import empty_view
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^$', empty_view, name="named-url5"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url6"),
     url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
-)
+]
diff --git a/tests/urlpatterns_reverse/included_namespace_urls.py b/tests/urlpatterns_reverse/included_namespace_urls.py
index aaa1a03687..1b28552ade 100644
--- a/tests/urlpatterns_reverse/included_namespace_urls.py
+++ b/tests/urlpatterns_reverse/included_namespace_urls.py
@@ -1,3 +1,5 @@
+import warnings
+
 from django.conf.urls import patterns, url, include
 
 from .namespace_urls import URLObject
@@ -6,18 +8,22 @@ from .views import view_class_instance
 
 testobj3 = URLObject('testapp', 'test-ns3')
 
-urlpatterns = patterns('urlpatterns_reverse.views',
-    url(r'^normal/$', 'empty_view', name='inc-normal-view'),
-    url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-normal-view'),
+# test deprecated patterns() function. convert to list of urls() in Django 2.0
+with warnings.catch_warnings(record=True) as w:
+    warnings.filterwarnings('ignore', module='django.conf.urls')
+
+    urlpatterns = patterns('urlpatterns_reverse.views',
+        url(r'^normal/$', 'empty_view', name='inc-normal-view'),
+        url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-normal-view'),
 
-    url(r'^\+\\\$\*/$', 'empty_view', name='inc-special-view'),
+        url(r'^\+\\\$\*/$', 'empty_view', name='inc-special-view'),
 
-    url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-mixed-args'),
-    url(r'^no_kwargs/(\d+)/(\d+)/$', 'empty_view', name='inc-no-kwargs'),
+        url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-mixed-args'),
+        url(r'^no_kwargs/(\d+)/(\d+)/$', 'empty_view', name='inc-no-kwargs'),
 
-    url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', view_class_instance, name='inc-view-class'),
+        url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', view_class_instance, name='inc-view-class'),
 
-    (r'^test3/', include(testobj3.urls)),
-    (r'^ns-included3/', include('urlpatterns_reverse.included_urls', namespace='inc-ns3')),
-    (r'^ns-included4/', include('urlpatterns_reverse.namespace_urls', namespace='inc-ns4')),
-)
+        (r'^test3/', include(testobj3.urls)),
+        (r'^ns-included3/', include('urlpatterns_reverse.included_urls', namespace='inc-ns3')),
+        (r'^ns-included4/', include('urlpatterns_reverse.namespace_urls', namespace='inc-ns4')),
+    )
diff --git a/tests/urlpatterns_reverse/included_no_kwargs_urls.py b/tests/urlpatterns_reverse/included_no_kwargs_urls.py
index e408487f9b..bed77f7a18 100644
--- a/tests/urlpatterns_reverse/included_no_kwargs_urls.py
+++ b/tests/urlpatterns_reverse/included_no_kwargs_urls.py
@@ -1,8 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import empty_view
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^inner-no-kwargs/(\d+)/', empty_view, name="inner-no-kwargs")
-)
+]
diff --git a/tests/urlpatterns_reverse/included_urls.py b/tests/urlpatterns_reverse/included_urls.py
index af6b6882e0..bbc8537820 100644
--- a/tests/urlpatterns_reverse/included_urls.py
+++ b/tests/urlpatterns_reverse/included_urls.py
@@ -1,10 +1,10 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import empty_view
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^$', empty_view, name="inner-nothing"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="inner-extra"),
     url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view, name="inner-disjunction"),
-)
+]
diff --git a/tests/urlpatterns_reverse/included_urls2.py b/tests/urlpatterns_reverse/included_urls2.py
index 9dcafc8535..ac8c770e7f 100644
--- a/tests/urlpatterns_reverse/included_urls2.py
+++ b/tests/urlpatterns_reverse/included_urls2.py
@@ -5,12 +5,12 @@ each name to resolve and Django must distinguish the possibilities based on the
 argument list.
 """
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import empty_view
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^part/(?P<value>\w+)/$', empty_view, name="part"),
     url(r'^part2/(?:(?P<value>\w+)/)?$', empty_view, name="part2"),
-)
+]
diff --git a/tests/urlpatterns_reverse/named_urls.py b/tests/urlpatterns_reverse/named_urls.py
index d4d35bac33..a4de1e1b87 100644
--- a/tests/urlpatterns_reverse/named_urls.py
+++ b/tests/urlpatterns_reverse/named_urls.py
@@ -1,11 +1,11 @@
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from .views import empty_view
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^$', empty_view, name="named-url1"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url2"),
     url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
-    (r'^included/', include('urlpatterns_reverse.included_named_urls')),
-)
+    url(r'^included/', include('urlpatterns_reverse.included_named_urls')),
+]
diff --git a/tests/urlpatterns_reverse/namespace_urls.py b/tests/urlpatterns_reverse/namespace_urls.py
index 014bc65990..cb4453fe57 100644
--- a/tests/urlpatterns_reverse/namespace_urls.py
+++ b/tests/urlpatterns_reverse/namespace_urls.py
@@ -1,6 +1,6 @@
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
-from .views import view_class_instance
+from . import views
 
 
 class URLObject(object):
@@ -9,11 +9,11 @@ class URLObject(object):
         self.namespace = namespace
 
     def urls(self):
-        return patterns('',
+        return ([
             url(r'^inner/$', 'empty_view', name='urlobject-view'),
             url(r'^inner/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='urlobject-view'),
             url(r'^inner/\+\\\$\*/$', 'empty_view', name='urlobject-special-view'),
-        ), self.app_name, self.namespace
+        ], self.app_name, self.namespace)
     urls = property(urls)
 
 testobj1 = URLObject('testapp', 'test-ns1')
@@ -23,35 +23,35 @@ default_testobj = URLObject('testapp', 'testapp')
 otherobj1 = URLObject('nodefault', 'other-ns1')
 otherobj2 = URLObject('nodefault', 'other-ns2')
 
-urlpatterns = patterns('urlpatterns_reverse.views',
-    url(r'^normal/$', 'empty_view', name='normal-view'),
-    url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='normal-view'),
-    url(r'^resolver_match/$', 'pass_resolver_match_view', name='test-resolver-match'),
+urlpatterns = [
+    url(r'^normal/$', views.empty_view, name='normal-view'),
+    url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', views.empty_view, name='normal-view'),
+    url(r'^resolver_match/$', views.pass_resolver_match_view, name='test-resolver-match'),
 
-    url(r'^\+\\\$\*/$', 'empty_view', name='special-view'),
+    url(r'^\+\\\$\*/$', views.empty_view, name='special-view'),
 
-    url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', 'empty_view', name='mixed-args'),
-    url(r'^no_kwargs/(\d+)/(\d+)/$', 'empty_view', name='no-kwargs'),
+    url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', views.empty_view, name='mixed-args'),
+    url(r'^no_kwargs/(\d+)/(\d+)/$', views.empty_view, name='no-kwargs'),
 
-    url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', view_class_instance, name='view-class'),
+    url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', views.view_class_instance, name='view-class'),
 
-    (r'^unnamed/normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view'),
-    (r'^unnamed/view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', view_class_instance),
+    url(r'^unnamed/normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', views.empty_view),
+    url(r'^unnamed/view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', views.view_class_instance),
 
-    (r'^test1/', include(testobj1.urls)),
-    (r'^test2/', include(testobj2.urls)),
-    (r'^default/', include(default_testobj.urls)),
+    url(r'^test1/', include(testobj1.urls)),
+    url(r'^test2/', include(testobj2.urls)),
+    url(r'^default/', include(default_testobj.urls)),
 
-    (r'^other1/', include(otherobj1.urls)),
-    (r'^other[246]/', include(otherobj2.urls)),
+    url(r'^other1/', include(otherobj1.urls)),
+    url(r'^other[246]/', include(otherobj2.urls)),
 
-    (r'^ns-included[135]/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')),
-    (r'^ns-included2/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')),
+    url(r'^ns-included[135]/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')),
+    url(r'^ns-included2/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')),
 
-    (r'^included/', include('urlpatterns_reverse.included_namespace_urls')),
-    (r'^inc(?P<outer>\d+)/', include('urlpatterns_reverse.included_urls', namespace='inc-ns5')),
+    url(r'^included/', include('urlpatterns_reverse.included_namespace_urls')),
+    url(r'^inc(?P<outer>\d+)/', include('urlpatterns_reverse.included_urls', namespace='inc-ns5')),
 
-    (r'^ns-outer/(?P<outer>\d+)/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-outer')),
+    url(r'^ns-outer/(?P<outer>\d+)/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-outer')),
 
-    (r'^\+\\\$\*/', include('urlpatterns_reverse.namespace_urls', namespace='special')),
-)
+    url(r'^\+\\\$\*/', include('urlpatterns_reverse.namespace_urls', namespace='special')),
+]
diff --git a/tests/urlpatterns_reverse/reverse_lazy_urls.py b/tests/urlpatterns_reverse/reverse_lazy_urls.py
index 0ef0a1f313..57358f6254 100644
--- a/tests/urlpatterns_reverse/reverse_lazy_urls.py
+++ b/tests/urlpatterns_reverse/reverse_lazy_urls.py
@@ -1,10 +1,10 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import empty_view, LazyRedirectView, login_required_view
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^redirected_to/$', empty_view, name='named-lazy-url-redirected-to'),
     url(r'^login/$', empty_view, name='some-login-page'),
     url(r'^login_required_view/$', login_required_view),
     url(r'^redirect/$', LazyRedirectView.as_view()),
-)
+]
diff --git a/tests/urlpatterns_reverse/urlconf_inner.py b/tests/urlpatterns_reverse/urlconf_inner.py
index 6d5cd27b35..d55c4dc650 100644
--- a/tests/urlpatterns_reverse/urlconf_inner.py
+++ b/tests/urlpatterns_reverse/urlconf_inner.py
@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.template import Template, Context
 from django.http import HttpResponse
 
@@ -8,6 +8,6 @@ def inner_view(request):
                        '{% url "inner" as inner_url %}inner:{{ inner_url }}').render(Context())
     return HttpResponse(content)
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^second_test/$', inner_view, name='inner'),
-)
+]
diff --git a/tests/urlpatterns_reverse/urlconf_outer.py b/tests/urlpatterns_reverse/urlconf_outer.py
index 20b9b09f98..36b6529efa 100644
--- a/tests/urlpatterns_reverse/urlconf_outer.py
+++ b/tests/urlpatterns_reverse/urlconf_outer.py
@@ -1,9 +1,9 @@
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from . import urlconf_inner
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^test/me/$', urlconf_inner.inner_view, name='outer'),
     url(r'^inner_urlconf/', include(urlconf_inner.__name__))
-)
+]
diff --git a/tests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py
index 923d0c7558..cafcb63888 100644
--- a/tests/urlpatterns_reverse/urls.py
+++ b/tests/urlpatterns_reverse/urls.py
@@ -1,64 +1,70 @@
+import warnings
+
 from django.conf.urls import patterns, url, include
 
 from .views import empty_view, absolute_kwargs_view
 
 
-other_patterns = patterns('',
+other_patterns = [
     url(r'non_path_include/$', empty_view, name='non_path_include'),
-)
+]
+
+# test deprecated patterns() function. convert to list of urls() in Django 2.0
+with warnings.catch_warnings(record=True):
+    warnings.filterwarnings('ignore', module='django.conf.urls')
 
-urlpatterns = patterns('',
-    url(r'^places/(\d+)/$', empty_view, name='places'),
-    url(r'^places?/$', empty_view, name="places?"),
-    url(r'^places+/$', empty_view, name="places+"),
-    url(r'^places*/$', empty_view, name="places*"),
-    url(r'^(?:places/)?$', empty_view, name="places2?"),
-    url(r'^(?:places/)+$', empty_view, name="places2+"),
-    url(r'^(?:places/)*$', empty_view, name="places2*"),
-    url(r'^places/(\d+|[a-z_]+)/', empty_view, name="places3"),
-    url(r'^places/(?P<id>\d+)/$', empty_view, name="places4"),
-    url(r'^people/(?P<name>\w+)/$', empty_view, name="people"),
-    url(r'^people/(?:name/)', empty_view, name="people2"),
-    url(r'^people/(?:name/(\w+)/)?', empty_view, name="people2a"),
-    url(r'^people/(?P<name>\w+)-(?P=name)/$', empty_view, name="people_backref"),
-    url(r'^optional/(?P<name>.*)/(?:.+/)?', empty_view, name="optional"),
-    url(r'^hardcoded/$', empty_view, name="hardcoded"),
-    url(r'^hardcoded/doc\.pdf$', empty_view, name="hardcoded2"),
-    url(r'^people/(?P<state>\w\w)/(?P<name>\w+)/$', empty_view, name="people3"),
-    url(r'^people/(?P<state>\w\w)/(?P<name>\d)/$', empty_view, name="people4"),
-    url(r'^people/((?P<state>\w\w)/test)?/(\w+)/$', empty_view, name="people6"),
-    url(r'^character_set/[abcdef0-9]/$', empty_view, name="range"),
-    url(r'^character_set/[\w]/$', empty_view, name="range2"),
-    url(r'^price/\$(\d+)/$', empty_view, name="price"),
-    url(r'^price/[$](\d+)/$', empty_view, name="price2"),
-    url(r'^price/[\$](\d+)/$', empty_view, name="price3"),
-    url(r'^product/(?P<product>\w+)\+\(\$(?P<price>\d+(\.\d+)?)\)/$', empty_view, name="product"),
-    url(r'^headlines/(?P<year>\d+)\.(?P<month>\d+)\.(?P<day>\d+)/$', empty_view, name="headlines"),
-    url(r'^windows_path/(?P<drive_name>[A-Z]):\\(?P<path>.+)/$', empty_view, name="windows"),
-    url(r'^special_chars/(?P<chars>.+)/$', empty_view, name="special"),
-    url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"),
-    url(r'^repeats/a{1,2}/$', empty_view, name="repeats"),
-    url(r'^repeats/a{2,4}/$', empty_view, name="repeats2"),
-    url(r'^repeats/a{2}/$', empty_view, name="repeats3"),
-    url(r'^(?i)CaseInsensitive/(\w+)', empty_view, name="insensitive"),
-    url(r'^test/1/?', empty_view, name="test"),
-    url(r'^(?i)test/2/?$', empty_view, name="test2"),
-    url(r'^outer/(?P<outer>\d+)/', include('urlpatterns_reverse.included_urls')),
-    url(r'^outer-no-kwargs/(\d+)/', include('urlpatterns_reverse.included_no_kwargs_urls')),
-    url('', include('urlpatterns_reverse.extra_urls')),
+    urlpatterns = patterns('',
+        url(r'^places/(\d+)/$', empty_view, name='places'),
+        url(r'^places?/$', empty_view, name="places?"),
+        url(r'^places+/$', empty_view, name="places+"),
+        url(r'^places*/$', empty_view, name="places*"),
+        url(r'^(?:places/)?$', empty_view, name="places2?"),
+        url(r'^(?:places/)+$', empty_view, name="places2+"),
+        url(r'^(?:places/)*$', empty_view, name="places2*"),
+        url(r'^places/(\d+|[a-z_]+)/', empty_view, name="places3"),
+        url(r'^places/(?P<id>\d+)/$', empty_view, name="places4"),
+        url(r'^people/(?P<name>\w+)/$', empty_view, name="people"),
+        url(r'^people/(?:name/)', empty_view, name="people2"),
+        url(r'^people/(?:name/(\w+)/)?', empty_view, name="people2a"),
+        url(r'^people/(?P<name>\w+)-(?P=name)/$', empty_view, name="people_backref"),
+        url(r'^optional/(?P<name>.*)/(?:.+/)?', empty_view, name="optional"),
+        url(r'^hardcoded/$', empty_view, name="hardcoded"),
+        url(r'^hardcoded/doc\.pdf$', empty_view, name="hardcoded2"),
+        url(r'^people/(?P<state>\w\w)/(?P<name>\w+)/$', empty_view, name="people3"),
+        url(r'^people/(?P<state>\w\w)/(?P<name>\d)/$', empty_view, name="people4"),
+        url(r'^people/((?P<state>\w\w)/test)?/(\w+)/$', empty_view, name="people6"),
+        url(r'^character_set/[abcdef0-9]/$', empty_view, name="range"),
+        url(r'^character_set/[\w]/$', empty_view, name="range2"),
+        url(r'^price/\$(\d+)/$', empty_view, name="price"),
+        url(r'^price/[$](\d+)/$', empty_view, name="price2"),
+        url(r'^price/[\$](\d+)/$', empty_view, name="price3"),
+        url(r'^product/(?P<product>\w+)\+\(\$(?P<price>\d+(\.\d+)?)\)/$', empty_view, name="product"),
+        url(r'^headlines/(?P<year>\d+)\.(?P<month>\d+)\.(?P<day>\d+)/$', empty_view, name="headlines"),
+        url(r'^windows_path/(?P<drive_name>[A-Z]):\\(?P<path>.+)/$', empty_view, name="windows"),
+        url(r'^special_chars/(?P<chars>.+)/$', empty_view, name="special"),
+        url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"),
+        url(r'^repeats/a{1,2}/$', empty_view, name="repeats"),
+        url(r'^repeats/a{2,4}/$', empty_view, name="repeats2"),
+        url(r'^repeats/a{2}/$', empty_view, name="repeats3"),
+        url(r'^(?i)CaseInsensitive/(\w+)', empty_view, name="insensitive"),
+        url(r'^test/1/?', empty_view, name="test"),
+        url(r'^(?i)test/2/?$', empty_view, name="test2"),
+        url(r'^outer/(?P<outer>\d+)/', include('urlpatterns_reverse.included_urls')),
+        url(r'^outer-no-kwargs/(\d+)/', include('urlpatterns_reverse.included_no_kwargs_urls')),
+        url('', include('urlpatterns_reverse.extra_urls')),
 
-    # This is non-reversible, but we shouldn't blow up when parsing it.
-    url(r'^(?:foo|bar)(\w+)/$', empty_view, name="disjunction"),
+        # This is non-reversible, but we shouldn't blow up when parsing it.
+        url(r'^(?:foo|bar)(\w+)/$', empty_view, name="disjunction"),
 
-    # Regression views for #9038. See tests for more details
-    url(r'arg_view/$', 'kwargs_view'),
-    url(r'arg_view/(?P<arg1>\d+)/$', 'kwargs_view'),
-    url(r'absolute_arg_view/(?P<arg1>\d+)/$', absolute_kwargs_view),
-    url(r'absolute_arg_view/$', absolute_kwargs_view),
+        # Regression views for #9038. See tests for more details
+        url(r'arg_view/$', 'kwargs_view'),
+        url(r'arg_view/(?P<arg1>\d+)/$', 'kwargs_view'),
+        url(r'absolute_arg_view/(?P<arg1>\d+)/$', absolute_kwargs_view),
+        url(r'absolute_arg_view/$', absolute_kwargs_view),
 
-    # Tests for #13154. Mixed syntax to test both ways of defining URLs.
-    url(r'defaults_view1/(?P<arg1>\d+)/', 'defaults_view', {'arg2': 1}, name='defaults'),
-    (r'defaults_view2/(?P<arg1>\d+)/', 'defaults_view', {'arg2': 2}, 'defaults'),
+        # Tests for #13154. Mixed syntax to test both ways of defining URLs.
+        url(r'defaults_view1/(?P<arg1>\d+)/', 'defaults_view', {'arg2': 1}, name='defaults'),
+        (r'defaults_view2/(?P<arg1>\d+)/', 'defaults_view', {'arg2': 2}, 'defaults'),
 
-    url('^includes/', include(other_patterns)),
-)
+        url('^includes/', include(other_patterns)),
+    )
diff --git a/tests/urlpatterns_reverse/urls_error_handlers.py b/tests/urlpatterns_reverse/urls_error_handlers.py
index 7146fdf43c..aee6bb91ae 100644
--- a/tests/urlpatterns_reverse/urls_error_handlers.py
+++ b/tests/urlpatterns_reverse/urls_error_handlers.py
@@ -1,8 +1,6 @@
 # Used by the ErrorHandlerResolutionTests test case.
 
-from django.conf.urls import patterns
-
-urlpatterns = patterns('')
+urlpatterns = []
 
 handler400 = 'urlpatterns_reverse.views.empty_view'
 handler404 = 'urlpatterns_reverse.views.empty_view'
diff --git a/tests/urlpatterns_reverse/urls_error_handlers_callables.py b/tests/urlpatterns_reverse/urls_error_handlers_callables.py
index 0900ec94ba..5fe8c728ff 100644
--- a/tests/urlpatterns_reverse/urls_error_handlers_callables.py
+++ b/tests/urlpatterns_reverse/urls_error_handlers_callables.py
@@ -1,11 +1,9 @@
 # Used by the ErrorHandlerResolutionTests test case.
 
-from django.conf.urls import patterns
-
 from .views import empty_view
 
 
-urlpatterns = patterns('')
+urlpatterns = []
 
 handler400 = empty_view
 handler404 = empty_view
diff --git a/tests/urlpatterns_reverse/urls_without_full_import.py b/tests/urlpatterns_reverse/urls_without_full_import.py
index c1dce5549c..5178a9cfe0 100644
--- a/tests/urlpatterns_reverse/urls_without_full_import.py
+++ b/tests/urlpatterns_reverse/urls_without_full_import.py
@@ -1,12 +1,12 @@
 # A URLs file that doesn't use the default
 # from django.conf.urls import *
 # import pattern.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import empty_view, bad_view
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^test_view/$', empty_view, name="test_view"),
     url(r'^bad_view/$', bad_view, name="bad_view"),
-)
+]