From 1136d57f01ce3e3efab44163ccd7b3b34ec4207f Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 31 Dec 2018 10:24:28 -0500 Subject: Updated a test to reflect the fact that "import *" isn't used in URLconfs anymore (refs #14675). --- tests/urlpatterns_reverse/tests.py | 2 +- tests/urlpatterns_reverse/urls_without_full_import.py | 11 ----------- tests/urlpatterns_reverse/urls_without_handlers.py | 9 +++++++++ 3 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 tests/urlpatterns_reverse/urls_without_full_import.py create mode 100644 tests/urlpatterns_reverse/urls_without_handlers.py (limited to 'tests') diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py index ff3ec045fb..61dbd208b7 100644 --- a/tests/urlpatterns_reverse/tests.py +++ b/tests/urlpatterns_reverse/tests.py @@ -1064,7 +1064,7 @@ class ErrorHandlerResolutionTests(SimpleTestCase): self.assertEqual(self.callable_resolver.resolve_error_handler(code), handler) -@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls_without_full_import') +@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls_without_handlers') class DefaultErrorHandlerTests(SimpleTestCase): def test_default_handler(self): diff --git a/tests/urlpatterns_reverse/urls_without_full_import.py b/tests/urlpatterns_reverse/urls_without_full_import.py deleted file mode 100644 index 5bbb0955e6..0000000000 --- a/tests/urlpatterns_reverse/urls_without_full_import.py +++ /dev/null @@ -1,11 +0,0 @@ -# A URLs file that doesn't use the default -# from django.conf.urls import * -# import pattern. -from django.conf.urls import url - -from .views import bad_view, empty_view - -urlpatterns = [ - url(r'^test_view/$', empty_view, name="test_view"), - url(r'^bad_view/$', bad_view, name="bad_view"), -] diff --git a/tests/urlpatterns_reverse/urls_without_handlers.py b/tests/urlpatterns_reverse/urls_without_handlers.py new file mode 100644 index 0000000000..4c248cd0d9 --- /dev/null +++ b/tests/urlpatterns_reverse/urls_without_handlers.py @@ -0,0 +1,9 @@ +# A URLconf that doesn't define any handlerXXX. +from django.conf.urls import url + +from .views import bad_view, empty_view + +urlpatterns = [ + url(r'^test_view/$', empty_view, name="test_view"), + url(r'^bad_view/$', bad_view, name="bad_view"), +] -- cgit v1.3