Fixed #22384 -- Deprecated reversing URLs by dotted path.

4 files changed, 33 insertions, 15 deletions

diff --git a/tests/resolve_url/tests.py b/tests/resolve_url/tests.py
index 542d325e8e..4ea68e460b 100644
--- a/tests/resolve_url/tests.py
+++ b/tests/resolve_url/tests.py
@@ -1,9 +1,11 @@
 from __future__ import unicode_literals
+import warnings
 
 from django.core.urlresolvers import NoReverseMatch
 from django.contrib.auth.views import logout
 from django.shortcuts import resolve_url
 from django.test import TestCase, override_settings
+from django.utils.deprecation import RemovedInDjango20Warning
 
 from .models import UnimportantThing
 
@@ -60,8 +62,10 @@ class ResolveUrlTests(TestCase):
         Tests that passing a view function to ``resolve_url`` will result in
         the URL path mapping to that view.
         """
-        resolved_url = resolve_url('django.contrib.auth.views.logout')
-        self.assertEqual('/accounts/logout/', resolved_url)
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=RemovedInDjango20Warning)
+            resolved_url = resolve_url('django.contrib.auth.views.logout')
+            self.assertEqual('/accounts/logout/', resolved_url)
 
     def test_domain(self):
         """
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index b81e63545d..b418cdac11 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -529,8 +529,7 @@ class TemplateTests(TestCase):
 
             # Warm the URL reversing cache. This ensures we don't pay the cost
             # warming the cache during one of the tests.
-            urlresolvers.reverse('template_tests.views.client_action',
-                                 kwargs={'id': 0, 'action': "update"})
+            urlresolvers.reverse('named.client', args=(0,))
 
             for name, vals in tests:
                 if isinstance(vals[2], tuple):
@@ -575,6 +574,7 @@ class TemplateTests(TestCase):
                                     try:
                                         with warnings.catch_warnings():
                                             # Ignore deprecations of using the wrong number of variables with the 'for' tag.
+                                            # and warnings for {% url %} reversing by dotted path
                                             warnings.filterwarnings("ignore", category=RemovedInDjango20Warning, module="django.template.defaulttags")
                                             output = self.render(test_template, vals)
                                     except ShouldNotExecuteException:
diff --git a/tests/urlpatterns_reverse/erroneous_urls.py b/tests/urlpatterns_reverse/erroneous_urls.py
index 966b219e21..2fec86f6cc 100644
--- a/tests/urlpatterns_reverse/erroneous_urls.py
+++ b/tests/urlpatterns_reverse/erroneous_urls.py
@@ -1,18 +1,26 @@
 from django.conf.urls import url
 
+from . import views
+
 urlpatterns = [
     # View has erroneous import
-    url(r'erroneous_inner/$', 'urlpatterns_reverse.views.erroneous_view'),
+    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/$', 'regressiontestes.urlpatterns_reverse.views.empty_view'),
+    url(r'(regex_error/$', views.empty_view),
 ]
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index d458d052e6..ebe04393df 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 
 import sys
 import unittest
+import warnings
 
 from django.contrib.auth.models import User
 from django.conf import settings
@@ -17,6 +18,7 @@ from django.http import HttpRequest, HttpResponseRedirect, HttpResponsePermanent
 from django.shortcuts import redirect
 from django.test import TestCase, override_settings
 from django.utils import six
+from django.utils.deprecation import RemovedInDjango20Warning
 
 from admin_scripts.tests import AdminScriptTestCase
 
@@ -173,13 +175,15 @@ class NoURLPatternsTests(TestCase):
 class URLPatternReverse(TestCase):
 
     def test_urlpattern_reverse(self):
-        for name, expected, args, kwargs in test_data:
-            try:
-                got = reverse(name, args=args, kwargs=kwargs)
-            except NoReverseMatch:
-                self.assertEqual(expected, NoReverseMatch)
-            else:
-                self.assertEqual(got, expected)
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=RemovedInDjango20Warning)
+            for name, expected, args, kwargs in test_data:
+                try:
+                    got = reverse(name, args=args, kwargs=kwargs)
+                except NoReverseMatch:
+                    self.assertEqual(expected, NoReverseMatch)
+                else:
+                    self.assertEqual(got, expected)
 
     def test_reverse_none(self):
         # Reversing None should raise an error, not return the last un-named view.
@@ -373,8 +377,10 @@ class ReverseShortcutTests(TestCase):
 
     def test_reverse_by_path_nested(self):
         # Views that are added to urlpatterns using include() should be
-        # reversible by dotted path.
-        self.assertEqual(reverse('urlpatterns_reverse.views.nested_view'), '/includes/nested_path/')
+        # reversible by doted path.
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=RemovedInDjango20Warning)
+            self.assertEqual(reverse('urlpatterns_reverse.views.nested_view'), '/includes/nested_path/')
 
     def test_redirect_view_object(self):
         from .views import absolute_kwargs_view