mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 18:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed #22218 -- Deprecated django.conf.urls.patterns.

Browse source 
Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.
This commit is contained in:
Tim Graham 2014-04-01 20:46:34 -04:00
parent e6ced2bb08
commit d73d0e071c
117 changed files with 1180 additions and 1099 deletions
Download patch file Download diff file Expand all files Collapse all files

52
tests/view_tests/generic_urls.py
View file

@ -1,11 +1,11 @@
# -*- coding:utf-8 -*-
from __future__ import unicode_literals
from django.conf.urls import patterns, url
from django.conf.urls import url
from django.views.generic import RedirectView
from .models import Article, DateArticle
from . import views
date_based_info_dict = {
'queryset': Article.objects.all(),
@ -26,38 +26,38 @@ 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 = patterns('',
(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
(r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
urlpatterns = [
url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
url(r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
# Special URLs for particular regression cases.
url('^中文/$', 'view_tests.views.redirect'),
url('^中文/target/$', 'view_tests.views.index_page'),
)
]
# redirects, both temporary and permanent, with non-ASCII targets
urlpatterns += patterns('',
('^nonascii_redirect/$', RedirectView.as_view(
urlpatterns += [
url('^nonascii_redirect/$', RedirectView.as_view(
url='/中文/target/', permanent=False)),
('^permanent_nonascii_redirect/$', RedirectView.as_view(
url('^permanent_nonascii_redirect/$', RedirectView.as_view(
url='/中文/target/', permanent=True)),
)
]
urlpatterns += patterns('view_tests.views',
(r'^shortcuts/render_to_response/$', 'render_to_response_view'),
(r'^shortcuts/render_to_response/request_context/$', 'render_to_response_view_with_request_context'),
(r'^shortcuts/render_to_response/content_type/$', 'render_to_response_view_with_content_type'),
(r'^shortcuts/render_to_response/dirs/$', 'render_to_response_view_with_dirs'),
(r'^shortcuts/render/$', 'render_view'),
(r'^shortcuts/render/base_context/$', 'render_view_with_base_context'),
(r'^shortcuts/render/content_type/$', 'render_view_with_content_type'),
(r'^shortcuts/render/status/$', 'render_view_with_status'),
(r'^shortcuts/render/current_app/$', 'render_view_with_current_app'),
(r'^shortcuts/render/dirs/$', 'render_with_dirs'),
(r'^shortcuts/render/current_app_conflict/$', 'render_view_with_current_app_conflict'),
)
urlpatterns += [
url(r'^shortcuts/render_to_response/$', views.render_to_response_view),
url(r'^shortcuts/render_to_response/request_context/$', views.render_to_response_view_with_request_context),
url(r'^shortcuts/render_to_response/content_type/$', views.render_to_response_view_with_content_type),
url(r'^shortcuts/render_to_response/dirs/$', views.render_to_response_view_with_dirs),
url(r'^shortcuts/render/$', views.render_view),
url(r'^shortcuts/render/base_context/$', views.render_view_with_base_context),
url(r'^shortcuts/render/content_type/$', views.render_view_with_content_type),
url(r'^shortcuts/render/status/$', views.render_view_with_status),
url(r'^shortcuts/render/current_app/$', views.render_view_with_current_app),
url(r'^shortcuts/render/dirs/$', views.render_with_dirs),
url(r'^shortcuts/render/current_app_conflict/$', views.render_view_with_current_app_conflict),
]
# json response
urlpatterns += patterns('view_tests.views',
(r'^json/response/$', 'json_response_view'),
)
urlpatterns += [
url(r'^json/response/$', views.json_response_view),
]