summaryrefslogtreecommitdiff
path: root/tests/urlpatterns_reverse
diff options
context:
space:
mode:
authorMarten Kenbeek <marten.knbk@gmail.com>2015-12-30 16:51:16 +0100
committerTim Graham <timograham@gmail.com>2015-12-31 14:21:29 -0500
commit16411b8400ad08f90c236bb2e18f65c655f903f8 (patch)
treedf01123093c126222e8f492512472e5834966100 /tests/urlpatterns_reverse
parentdf3d5b1d73699b323aac377dffab039dca26c1e4 (diff)
Fixed #26013 -- Moved django.core.urlresolvers to django.urls.
Thanks to Tim Graham for the review.
Diffstat (limited to 'tests/urlpatterns_reverse')
-rw-r--r--tests/urlpatterns_reverse/middleware.py2
-rw-r--r--tests/urlpatterns_reverse/tests.py10
-rw-r--r--tests/urlpatterns_reverse/views.py2
-rw-r--r--tests/urlpatterns_reverse/views_broken.py2
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/urlpatterns_reverse/middleware.py b/tests/urlpatterns_reverse/middleware.py
index cc80f14145..13c3d104b6 100644
--- a/tests/urlpatterns_reverse/middleware.py
+++ b/tests/urlpatterns_reverse/middleware.py
@@ -1,5 +1,5 @@
-from django.core.urlresolvers import reverse
from django.http import HttpResponse, StreamingHttpResponse
+from django.urls import reverse
from . import urlconf_inner
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index da2fc86b8b..42cbe50091 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -13,10 +13,6 @@ from django.conf import settings
from django.conf.urls import include, url
from django.contrib.auth.models import User
from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
-from django.core.urlresolvers import (
- NoReverseMatch, RegexURLPattern, RegexURLResolver, Resolver404,
- ResolverMatch, get_callable, get_resolver, resolve, reverse, reverse_lazy,
-)
from django.http import (
HttpRequest, HttpResponsePermanentRedirect, HttpResponseRedirect,
)
@@ -25,6 +21,10 @@ from django.test import (
SimpleTestCase, TestCase, ignore_warnings, override_settings,
)
from django.test.utils import override_script_prefix
+from django.urls import (
+ NoReverseMatch, RegexURLPattern, RegexURLResolver, Resolver404,
+ ResolverMatch, get_callable, get_resolver, resolve, reverse, reverse_lazy,
+)
from django.utils import six
from django.utils.deprecation import RemovedInDjango20Warning
@@ -458,7 +458,7 @@ class ReverseLazySettingsTest(AdminScriptTestCase):
"""
def setUp(self):
self.write_settings('settings.py', extra="""
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
LOGIN_URL = reverse_lazy('login')""")
def tearDown(self):
diff --git a/tests/urlpatterns_reverse/views.py b/tests/urlpatterns_reverse/views.py
index 6fd1c53a00..6bf5c453d1 100644
--- a/tests/urlpatterns_reverse/views.py
+++ b/tests/urlpatterns_reverse/views.py
@@ -1,8 +1,8 @@
from functools import partial, update_wrapper
from django.contrib.auth.decorators import user_passes_test
-from django.core.urlresolvers import reverse_lazy
from django.http import HttpResponse
+from django.urls import reverse_lazy
from django.views.generic import RedirectView
diff --git a/tests/urlpatterns_reverse/views_broken.py b/tests/urlpatterns_reverse/views_broken.py
index 4953aab239..2bc60c4b98 100644
--- a/tests/urlpatterns_reverse/views_broken.py
+++ b/tests/urlpatterns_reverse/views_broken.py
@@ -1,2 +1,2 @@
# I just raise an AttributeError to confuse the view loading mechanism
-raise AttributeError('I am here to confuse django.core.urlresolvers.get_callable')
+raise AttributeError('I am here to confuse django.urls.get_callable')