Fixed #23276 -- Deprecated passing views as strings to url().

3 files changed, 33 insertions, 29 deletions

diff --git a/tests/urlpatterns_reverse/erroneous_urls.py b/tests/urlpatterns_reverse/erroneous_urls.py
index 2fec86f6cc..b4d6132966 100644
--- a/tests/urlpatterns_reverse/erroneous_urls.py
+++ b/tests/urlpatterns_reverse/erroneous_urls.py
@@ -1,26 +1,27 @@
+import warnings
+
 from django.conf.urls import url
 
 from . import views
 
-urlpatterns = [
-    # View has erroneous import
-    url(r'erroneous_inner/$', views.erroneous_view),
-    # Module has erroneous import
-    # Remove in Django 2.0 along with erroneous_views_module as this is only
-    # an issue with string in urlpatterns
-    url(r'erroneous_outer/$', 'urlpatterns_reverse.erroneous_views_module.erroneous_view'),
-    # Module is an unqualified string
-    url(r'erroneous_unqualified/$', 'unqualified_view'),
-    # View does not exist
-    # Remove in Django 2.0 along with erroneous_views_module as this is only
-    # an issue with string in urlpatterns
-    url(r'missing_inner/$', 'urlpatterns_reverse.views.missing_view'),
-    # View is not callable
-    # Remove in Django 2.0 along with erroneous_views_module as this is only
-    # an issue with string in urlpatterns
-    url(r'uncallable/$', 'urlpatterns_reverse.views.uncallable'),
-    # Module does not exist
-    url(r'missing_outer/$', 'urlpatterns_reverse.missing_module.missing_view'),
-    # Regex contains an error (refs #6170)
-    url(r'(regex_error/$', views.empty_view),
-]
+# Test deprecated behavior of passing strings as view to url().
+# Some of these can be removed in Django 2.0 as they aren't convertable to
+# callabls.
+with warnings.catch_warnings(record=True):
+    warnings.filterwarnings('ignore', module='django.conf.urls')
+    urlpatterns = [
+        # View has erroneous import
+        url(r'erroneous_inner/$', views.erroneous_view),
+        # Module has erroneous import
+        url(r'erroneous_outer/$', 'urlpatterns_reverse.erroneous_views_module.erroneous_view'),
+        # Module is an unqualified string
+        url(r'erroneous_unqualified/$', 'unqualified_view'),
+        # View does not exist
+        url(r'missing_inner/$', 'urlpatterns_reverse.views.missing_view'),
+        # View is not callable
+        url(r'uncallable/$', 'urlpatterns_reverse.views.uncallable'),
+        # Module does not exist
+        url(r'missing_outer/$', 'urlpatterns_reverse.missing_module.missing_view'),
+        # Regex contains an error (refs #6170)
+        url(r'(regex_error/$', views.empty_view),
+    ]
diff --git a/tests/urlpatterns_reverse/namespace_urls.py b/tests/urlpatterns_reverse/namespace_urls.py
index 166189d286..12cf85f7d3 100644
--- a/tests/urlpatterns_reverse/namespace_urls.py
+++ b/tests/urlpatterns_reverse/namespace_urls.py
@@ -10,9 +10,9 @@ class URLObject(object):
 
     def urls(self):
         return ([
-            url(r'^inner/$', 'urlpatterns_reverse.views.empty_view', name='urlobject-view'),
-            url(r'^inner/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', 'urlpatterns_reverse.views.empty_view', name='urlobject-view'),
-            url(r'^inner/\+\\\$\*/$', 'urlpatterns_reverse.views.empty_view', name='urlobject-special-view'),
+            url(r'^inner/$', views.empty_view, name='urlobject-view'),
+            url(r'^inner/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.empty_view, name='urlobject-view'),
+            url(r'^inner/\+\\\$\*/$', views.empty_view, name='urlobject-special-view'),
         ], self.app_name, self.namespace)
     urls = property(urls)
 
diff --git a/tests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py
index bc30280da0..943f92e956 100644
--- a/tests/urlpatterns_reverse/urls.py
+++ b/tests/urlpatterns_reverse/urls.py
@@ -2,12 +2,15 @@ import warnings
 
 from django.conf.urls import patterns, url, include
 
-from .views import empty_view, empty_view_partial, empty_view_wrapped, absolute_kwargs_view
+from .views import (
+    absolute_kwargs_view, defaults_view, empty_view, empty_view_partial,
+    empty_view_wrapped, nested_view,
+)
 
 
 other_patterns = [
     url(r'non_path_include/$', empty_view, name='non_path_include'),
-    url(r'nested_path/$', 'urlpatterns_reverse.views.nested_view'),
+    url(r'nested_path/$', nested_view),
 ]
 
 # test deprecated patterns() function. convert to list of urls() in Django 2.0
@@ -68,8 +71,8 @@ with warnings.catch_warnings(record=True):
         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>[0-9]+)/', 'urlpatterns_reverse.views.defaults_view', {'arg2': 1}, name='defaults'),
-        (r'defaults_view2/(?P<arg1>[0-9]+)/', 'urlpatterns_reverse.views.defaults_view', {'arg2': 2}, 'defaults'),
+        url(r'defaults_view1/(?P<arg1>[0-9]+)/', defaults_view, {'arg2': 1}, name='defaults'),
+        (r'defaults_view2/(?P<arg1>[0-9]+)/', defaults_view, {'arg2': 2}, 'defaults'),
 
         url('^includes/', include(other_patterns)),
     )