summaryrefslogtreecommitdiff
path: root/tests/view_tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-08-12 10:54:42 -0400
committerTim Graham <timograham@gmail.com>2014-08-12 13:15:40 -0400
commita9fd740d22bc4fed5fdb280c036618000ee13df1 (patch)
tree18a58170b4633f22e5869db2c2ed086245ed415c /tests/view_tests
parent2003cb23d4f1b3be717855d41b562d4d5cfebe99 (diff)
Fixed #23276 -- Deprecated passing views as strings to url().
Diffstat (limited to 'tests/view_tests')
-rw-r--r--tests/view_tests/generic_urls.py9
-rw-r--r--tests/view_tests/regression_21530_urls.py4
-rw-r--r--tests/view_tests/urls.py4
3 files changed, 10 insertions, 7 deletions
diff --git a/tests/view_tests/generic_urls.py b/tests/view_tests/generic_urls.py
index 6d44468ce6..1150172ab9 100644
--- a/tests/view_tests/generic_urls.py
+++ b/tests/view_tests/generic_urls.py
@@ -2,6 +2,7 @@
from __future__ import unicode_literals
from django.conf.urls import url
+from django.contrib.auth import views as auth_views
from django.views.generic import RedirectView
from .models import Article, DateArticle
@@ -27,12 +28,12 @@ numeric_days_info_dict = dict(date_based_info_dict, day_format='%d')
date_based_datefield_info_dict = dict(date_based_info_dict, queryset=DateArticle.objects.all())
urlpatterns = [
- url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
- url(r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
+ url(r'^accounts/login/$', auth_views.login, {'template_name': 'login.html'}),
+ url(r'^accounts/logout/$', auth_views.logout),
# Special URLs for particular regression cases.
- url('^中文/$', 'view_tests.views.redirect'),
- url('^中文/target/$', 'view_tests.views.index_page'),
+ url('^中文/$', views.redirect),
+ url('^中文/target/$', views.index_page),
]
# redirects, both temporary and permanent, with non-ASCII targets
diff --git a/tests/view_tests/regression_21530_urls.py b/tests/view_tests/regression_21530_urls.py
index 7a91ddebd7..706a08c888 100644
--- a/tests/view_tests/regression_21530_urls.py
+++ b/tests/view_tests/regression_21530_urls.py
@@ -1,5 +1,7 @@
from django.conf.urls import url
+from . import views
+
urlpatterns = [
- url(r'^index/$', 'view_tests.views.index_page', name='index'),
+ url(r'^index/$', views.index_page, name='index'),
]
diff --git a/tests/view_tests/urls.py b/tests/view_tests/urls.py
index 202f8589eb..0dfc2d4446 100644
--- a/tests/view_tests/urls.py
+++ b/tests/view_tests/urls.py
@@ -3,7 +3,7 @@ from os import path
from django.conf.urls import url, include
from django.utils._os import upath
-from django.views import defaults, i18n
+from django.views import defaults, i18n, static
from . import views
@@ -71,7 +71,7 @@ urlpatterns = [
url(r'^jsi18n_template/$', views.jsi18n),
# Static views
- url(r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': media_dir}),
+ url(r'^site_media/(?P<path>.*)$', static.serve, {'document_root': media_dir}),
]
urlpatterns += [