[1.8.x] Renamed RemovedInDjango20Warning to RemovedInDjango110Warning.

4 files changed, 12 insertions, 12 deletions

diff --git a/tests/urlpatterns_reverse/erroneous_urls.py b/tests/urlpatterns_reverse/erroneous_urls.py
index b08376dc91..da4dd98e58 100644
--- a/tests/urlpatterns_reverse/erroneous_urls.py
+++ b/tests/urlpatterns_reverse/erroneous_urls.py
@@ -1,15 +1,15 @@
 import warnings
 
 from django.conf.urls import url
-from django.utils.deprecation import RemovedInDjango20Warning
+from django.utils.deprecation import RemovedInDjango110Warning
 
 from . import views
 
 # 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
+# Some of these can be removed in Django 1.10 as they aren't convertable to
 # callables.
 with warnings.catch_warnings():
-    warnings.filterwarnings('ignore', category=RemovedInDjango20Warning)
+    warnings.filterwarnings('ignore', category=RemovedInDjango110Warning)
     urlpatterns = [
         # View has erroneous import
         url(r'erroneous_inner/$', views.erroneous_view),
diff --git a/tests/urlpatterns_reverse/included_namespace_urls.py b/tests/urlpatterns_reverse/included_namespace_urls.py
index 8769f112e9..b387440cb5 100644
--- a/tests/urlpatterns_reverse/included_namespace_urls.py
+++ b/tests/urlpatterns_reverse/included_namespace_urls.py
@@ -1,16 +1,16 @@
 import warnings
 
 from django.conf.urls import include, patterns, url
-from django.utils.deprecation import RemovedInDjango20Warning
+from django.utils.deprecation import RemovedInDjango110Warning
 
 from .namespace_urls import URLObject
 from .views import view_class_instance
 
 testobj3 = URLObject('testapp', 'test-ns3')
 
-# test deprecated patterns() function. convert to list of urls() in Django 2.0
+# test deprecated patterns() function. convert to list of urls() in Django 1.10
 with warnings.catch_warnings():
-    warnings.filterwarnings('ignore', category=RemovedInDjango20Warning)
+    warnings.filterwarnings('ignore', category=RemovedInDjango110Warning)
 
     urlpatterns = patterns('urlpatterns_reverse.views',
         url(r'^normal/$', 'empty_view', name='inc-normal-view'),
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index 8f8496a515..e9b672f2b8 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -25,7 +25,7 @@ from django.test import (
     SimpleTestCase, TestCase, ignore_warnings, override_settings,
 )
 from django.utils import six
-from django.utils.deprecation import RemovedInDjango20Warning
+from django.utils.deprecation import RemovedInDjango110Warning
 
 from . import middleware, urlconf_outer, views
 from .views import empty_view
@@ -198,7 +198,7 @@ class NoURLPatternsTests(TestCase):
 @override_settings(ROOT_URLCONF='urlpatterns_reverse.urls')
 class URLPatternReverse(TestCase):
 
-    @ignore_warnings(category=RemovedInDjango20Warning)
+    @ignore_warnings(category=RemovedInDjango110Warning)
     def test_urlpattern_reverse(self):
         for name, expected, args, kwargs in test_data:
             try:
@@ -416,7 +416,7 @@ class ReverseShortcutTests(TestCase):
         redirect("urlpatterns_reverse.nonimported_module.view")
         self.assertNotIn("urlpatterns_reverse.nonimported_module", sys.modules)
 
-    @ignore_warnings(category=RemovedInDjango20Warning)
+    @ignore_warnings(category=RemovedInDjango110Warning)
     def test_reverse_by_path_nested(self):
         # Views that are added to urlpatterns using include() should be
         # reversible by dotted path.
diff --git a/tests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py
index d6b692d220..91be1dcde4 100644
--- a/tests/urlpatterns_reverse/urls.py
+++ b/tests/urlpatterns_reverse/urls.py
@@ -1,7 +1,7 @@
 import warnings
 
 from django.conf.urls import include, patterns, url
-from django.utils.deprecation import RemovedInDjango20Warning
+from django.utils.deprecation import RemovedInDjango110Warning
 
 from .views import (
     absolute_kwargs_view, defaults_view, empty_view, empty_view_partial,
@@ -13,9 +13,9 @@ other_patterns = [
     url(r'nested_path/$', nested_view),
 ]
 
-# test deprecated patterns() function. convert to list of urls() in Django 2.0
+# test deprecated patterns() function. convert to list of urls() in Django 1.10
 with warnings.catch_warnings():
-    warnings.filterwarnings('ignore', category=RemovedInDjango20Warning)
+    warnings.filterwarnings('ignore', category=RemovedInDjango110Warning)
 
     urlpatterns = patterns('',
         url(r'^places/([0-9]+)/$', empty_view, name='places'),