diff options
Diffstat (limited to 'tests')
48 files changed, 49 insertions, 50 deletions
diff --git a/tests/modeltests/test_client/urls.py b/tests/modeltests/test_client/urls.py index 66019498e6..6a2d0a96c1 100644 --- a/tests/modeltests/test_client/urls.py +++ b/tests/modeltests/test_client/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns from django.views.generic import RedirectView import views diff --git a/tests/regressiontests/admin_views/customadmin.py b/tests/regressiontests/admin_views/customadmin.py index c31d3794cd..760e93f0f8 100644 --- a/tests/regressiontests/admin_views/customadmin.py +++ b/tests/regressiontests/admin_views/customadmin.py @@ -1,7 +1,7 @@ """ A second, custom AdminSite -- see tests.CustomAdminSiteTests. """ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns from django.contrib import admin from django.http import HttpResponse diff --git a/tests/regressiontests/admin_views/urls.py b/tests/regressiontests/admin_views/urls.py index f3f1fbd43a..7320a3c7c8 100644 --- a/tests/regressiontests/admin_views/urls.py +++ b/tests/regressiontests/admin_views/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include from django.contrib import admin import views import customadmin diff --git a/tests/regressiontests/admin_widgets/urls.py b/tests/regressiontests/admin_widgets/urls.py index af73d5351d..9e6bc1290f 100644 --- a/tests/regressiontests/admin_widgets/urls.py +++ b/tests/regressiontests/admin_widgets/urls.py @@ -1,5 +1,4 @@ - -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include import widgetadmin urlpatterns = patterns('', diff --git a/tests/regressiontests/comment_tests/urls.py b/tests/regressiontests/comment_tests/urls.py index a2a4d09c64..d1a4ec01c2 100644 --- a/tests/regressiontests/comment_tests/urls.py +++ b/tests/regressiontests/comment_tests/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from django.contrib.comments.feeds import LatestCommentFeed feeds = { diff --git a/tests/regressiontests/comment_tests/urls_admin.py b/tests/regressiontests/comment_tests/urls_admin.py index d7e1a4e916..79a1b75451 100644 --- a/tests/regressiontests/comment_tests/urls_admin.py +++ b/tests/regressiontests/comment_tests/urls_admin.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include from django.contrib import admin from django.contrib.comments.admin import CommentsAdmin from django.contrib.comments.models import Comment diff --git a/tests/regressiontests/conditional_processing/urls.py b/tests/regressiontests/conditional_processing/urls.py index 8c1f465464..d84030e393 100644 --- a/tests/regressiontests/conditional_processing/urls.py +++ b/tests/regressiontests/conditional_processing/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns import views urlpatterns = patterns('', diff --git a/tests/regressiontests/context_processors/urls.py b/tests/regressiontests/context_processors/urls.py index 7e8ba967c1..29153fadf2 100644 --- a/tests/regressiontests/context_processors/urls.py +++ b/tests/regressiontests/context_processors/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url import views diff --git a/tests/regressiontests/file_uploads/urls.py b/tests/regressiontests/file_uploads/urls.py index a5c2702311..904f28bad9 100644 --- a/tests/regressiontests/file_uploads/urls.py +++ b/tests/regressiontests/file_uploads/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns import views urlpatterns = patterns('', diff --git a/tests/regressiontests/generic_inline_admin/urls.py b/tests/regressiontests/generic_inline_admin/urls.py index c3e8af8fe1..f41587280d 100644 --- a/tests/regressiontests/generic_inline_admin/urls.py +++ b/tests/regressiontests/generic_inline_admin/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include from django.contrib import admin urlpatterns = patterns('', diff --git a/tests/regressiontests/generic_views/urls.py b/tests/regressiontests/generic_views/urls.py index 0f844e0243..0f725d8fde 100644 --- a/tests/regressiontests/generic_views/urls.py +++ b/tests/regressiontests/generic_views/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from django.views.generic import TemplateView from django.views.decorators.cache import cache_page diff --git a/tests/regressiontests/i18n/patterns/urls/default.py b/tests/regressiontests/i18n/patterns/urls/default.py index 8d178e67d4..f117502753 100644 --- a/tests/regressiontests/i18n/patterns/urls/default.py +++ b/tests/regressiontests/i18n/patterns/urls/default.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, include, url +from django.conf.urls import patterns, include, url from django.conf.urls.i18n import i18n_patterns from django.utils.translation import ugettext_lazy as _ from django.views.generic import TemplateView diff --git a/tests/regressiontests/i18n/patterns/urls/disabled.py b/tests/regressiontests/i18n/patterns/urls/disabled.py index e4094695f9..60fd222024 100644 --- a/tests/regressiontests/i18n/patterns/urls/disabled.py +++ b/tests/regressiontests/i18n/patterns/urls/disabled.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import url +from django.conf.urls import url from django.conf.urls.i18n import i18n_patterns from django.views.generic import TemplateView diff --git a/tests/regressiontests/i18n/patterns/urls/namespace.py b/tests/regressiontests/i18n/patterns/urls/namespace.py index 0e703405cb..bf43949961 100644 --- a/tests/regressiontests/i18n/patterns/urls/namespace.py +++ b/tests/regressiontests/i18n/patterns/urls/namespace.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from django.utils.translation import ugettext_lazy as _ from django.views.generic import TemplateView diff --git a/tests/regressiontests/i18n/patterns/urls/wrong.py b/tests/regressiontests/i18n/patterns/urls/wrong.py index 40302fc98f..22e9d535cc 100644 --- a/tests/regressiontests/i18n/patterns/urls/wrong.py +++ b/tests/regressiontests/i18n/patterns/urls/wrong.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import include, url +from django.conf.urls import include, url from django.conf.urls.i18n import i18n_patterns from django.utils.translation import ugettext_lazy as _ diff --git a/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py b/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py index 46ecfd0e7a..2f7105d637 100644 --- a/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py +++ b/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import url +from django.conf.urls import url from django.conf.urls.i18n import i18n_patterns from django.utils.translation import ugettext_lazy as _ from django.views.generic import TemplateView diff --git a/tests/regressiontests/middleware/cond_get_urls.py b/tests/regressiontests/middleware/cond_get_urls.py index 2c2a8f8278..1dadd0d31a 100644 --- a/tests/regressiontests/middleware/cond_get_urls.py +++ b/tests/regressiontests/middleware/cond_get_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns from django.http import HttpResponse urlpatterns = patterns('', diff --git a/tests/regressiontests/middleware/extra_urls.py b/tests/regressiontests/middleware/extra_urls.py index b2a89023d5..1aee48f7be 100644 --- a/tests/regressiontests/middleware/extra_urls.py +++ b/tests/regressiontests/middleware/extra_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('', (r'^middleware/customurlconf/noslash$', 'view'), diff --git a/tests/regressiontests/middleware/urls.py b/tests/regressiontests/middleware/urls.py index 88a4b37ddc..217e3ae034 100644 --- a/tests/regressiontests/middleware/urls.py +++ b/tests/regressiontests/middleware/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('', (r'^noslash$', 'view'), diff --git a/tests/regressiontests/middleware_exceptions/urls.py b/tests/regressiontests/middleware_exceptions/urls.py index 72c690fa41..ae78a65468 100644 --- a/tests/regressiontests/middleware_exceptions/urls.py +++ b/tests/regressiontests/middleware_exceptions/urls.py @@ -1,5 +1,5 @@ # coding: utf-8 -from django.conf.urls.defaults import * +from django.conf.urls import patterns import views diff --git a/tests/regressiontests/model_permalink/urls.py b/tests/regressiontests/model_permalink/urls.py index 6a84117a9b..409fc222c8 100644 --- a/tests/regressiontests/model_permalink/urls.py +++ b/tests/regressiontests/model_permalink/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url urlpatterns = patterns('', url(r'^guitarists/(\w{1,50})/$', 'unimplemented_view_placeholder', name='guitarist_detail'), diff --git a/tests/regressiontests/special_headers/urls.py b/tests/regressiontests/special_headers/urls.py index 5d223fdb79..db19ab958d 100644 --- a/tests/regressiontests/special_headers/urls.py +++ b/tests/regressiontests/special_headers/urls.py @@ -1,5 +1,5 @@ # coding: utf-8 -from django.conf.urls.defaults import * +from django.conf.urls import patterns from django.views.generic.list_detail import object_detail from models import Article import views diff --git a/tests/regressiontests/staticfiles_tests/urls/default.py b/tests/regressiontests/staticfiles_tests/urls/default.py index 5788268175..e50a9e2907 100644 --- a/tests/regressiontests/staticfiles_tests/urls/default.py +++ b/tests/regressiontests/staticfiles_tests/urls/default.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('', url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'), diff --git a/tests/regressiontests/syndication/urls.py b/tests/regressiontests/syndication/urls.py index 1f7ab73f71..ddbc7a130a 100644 --- a/tests/regressiontests/syndication/urls.py +++ b/tests/regressiontests/syndication/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns import feeds diff --git a/tests/regressiontests/templates/alternate_urls.py b/tests/regressiontests/templates/alternate_urls.py index e68f1c5875..ca74d64635 100644 --- a/tests/regressiontests/templates/alternate_urls.py +++ b/tests/regressiontests/templates/alternate_urls.py @@ -1,5 +1,5 @@ # coding: utf-8 -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from regressiontests.templates import views diff --git a/tests/regressiontests/templates/urls.py b/tests/regressiontests/templates/urls.py index 28d4133228..96e1ea2bfe 100644 --- a/tests/regressiontests/templates/urls.py +++ b/tests/regressiontests/templates/urls.py @@ -1,5 +1,5 @@ # coding: utf-8 -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from regressiontests.templates import views urlpatterns = patterns('', diff --git a/tests/regressiontests/test_client_regress/urls.py b/tests/regressiontests/test_client_regress/urls.py index 454f35b824..b973575509 100644 --- a/tests/regressiontests/test_client_regress/urls.py +++ b/tests/regressiontests/test_client_regress/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from django.views.generic import RedirectView import views diff --git a/tests/regressiontests/test_utils/urls.py b/tests/regressiontests/test_utils/urls.py index f3df170835..1bf0a0c756 100644 --- a/tests/regressiontests/test_utils/urls.py +++ b/tests/regressiontests/test_utils/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns import views diff --git a/tests/regressiontests/urlpatterns_reverse/erroneous_urls.py b/tests/regressiontests/urlpatterns_reverse/erroneous_urls.py index b09fff7e3e..8e6433e16e 100644 --- a/tests/regressiontests/urlpatterns_reverse/erroneous_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/erroneous_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('', # View has erroneous import diff --git a/tests/regressiontests/urlpatterns_reverse/extra_urls.py b/tests/regressiontests/urlpatterns_reverse/extra_urls.py index c171f6d6f9..4dbfb90c22 100644 --- a/tests/regressiontests/urlpatterns_reverse/extra_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/extra_urls.py @@ -2,7 +2,7 @@ Some extra URL patterns that are included at the top level. """ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include from views import empty_view urlpatterns = patterns('', diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py index b3f7903b41..32d2b2976b 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include from views import empty_view urlpatterns = patterns('', diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py index 96c42c3e4d..2a9779d64f 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py +++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from views import empty_view urlpatterns = patterns('', diff --git a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py index 16887e2a9b..c878f97716 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include from namespace_urls import URLObject from views import view_class_instance diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls.py b/tests/regressiontests/urlpatterns_reverse/included_urls.py index f8acf342f2..ae2c626336 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/included_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from views import empty_view urlpatterns = patterns('', diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_urls2.py index f414ca638c..b6fb4c6a6a 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_urls2.py +++ b/tests/regressiontests/urlpatterns_reverse/included_urls2.py @@ -5,7 +5,7 @@ each name to resolve and Django must distinguish the possibilities based on the argument list. """ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from views import empty_view urlpatterns = patterns('', diff --git a/tests/regressiontests/urlpatterns_reverse/named_urls.py b/tests/regressiontests/urlpatterns_reverse/named_urls.py index d8a61a106c..fa71f53c17 100644 --- a/tests/regressiontests/urlpatterns_reverse/named_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/named_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include from views import empty_view urlpatterns = patterns('', diff --git a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py index 4e411eed9c..5a516f92cc 100644 --- a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include from views import view_class_instance class URLObject(object): diff --git a/tests/regressiontests/urlpatterns_reverse/no_urls.py b/tests/regressiontests/urlpatterns_reverse/no_urls.py index c9b9efea78..5b1959c7dc 100644 --- a/tests/regressiontests/urlpatterns_reverse/no_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/no_urls.py @@ -1,2 +1,2 @@ -#from django.conf.urls.defaults import * +#from django.conf.urls import patterns, url, include diff --git a/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py b/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py index 0dff812707..5d336268d9 100644 --- a/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from views import empty_view, LazyRedirectView, login_required_view diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py b/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py index e9819623a3..4d3fb74ca6 100644 --- a/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py +++ b/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from django.template import Template, Context from django.http import HttpResponse diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py b/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py index 506e03666e..0762fc5db0 100644 --- a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py +++ b/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include import urlconf_inner diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/regressiontests/urlpatterns_reverse/urls.py index ba59cf8f9a..6a324f042d 100644 --- a/tests/regressiontests/urlpatterns_reverse/urls.py +++ b/tests/regressiontests/urlpatterns_reverse/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include from views import empty_view, absolute_kwargs_view other_patterns = patterns('', diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py index c2e0d32498..7a3e22078e 100644 --- a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py +++ b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py @@ -1,6 +1,6 @@ # Used by the ErrorHandlerResolutionTests test case. -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('') diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py index 00f25a7236..c3d4855086 100644 --- a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py +++ b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py @@ -1,6 +1,6 @@ # Used by the ErrorHandlerResolutionTests test case. -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns from views import empty_view urlpatterns = patterns('') diff --git a/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py b/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py index 75a195ed14..0e58a157cf 100644 --- a/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py +++ b/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py @@ -1,7 +1,7 @@ # A URLs file that doesn't use the default -# from django.conf.urls.defaults import * +# from django.conf.urls import * # import pattern. -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from views import empty_view, bad_view urlpatterns = patterns('', diff --git a/tests/regressiontests/views/generic_urls.py b/tests/regressiontests/views/generic_urls.py index c608cc1c7f..cf2addc181 100644 --- a/tests/regressiontests/views/generic_urls.py +++ b/tests/regressiontests/views/generic_urls.py @@ -1,5 +1,5 @@ # -*- coding:utf-8 -*- -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from models import * diff --git a/tests/regressiontests/views/urls.py b/tests/regressiontests/views/urls.py index 6af725357b..2ce56b67f8 100644 --- a/tests/regressiontests/views/urls.py +++ b/tests/regressiontests/views/urls.py @@ -1,7 +1,7 @@ # coding: utf-8 from os import path -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include import views diff --git a/tests/urls.py b/tests/urls.py index b3f719d840..654111de60 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include urlpatterns = patterns('', |