mirror of
https://github.com/django/django.git
synced 2025-10-23 21:59:11 +00:00
Fixed #22218 -- Deprecated django.conf.urls.patterns.
Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.
This commit is contained in:
@@ -1,37 +1,37 @@
|
||||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
||||
from django.views.generic import RedirectView
|
||||
|
||||
from . import views
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(r'^get_view/$', views.get_view),
|
||||
(r'^post_view/$', views.post_view),
|
||||
(r'^header_view/$', views.view_with_header),
|
||||
(r'^raw_post_view/$', views.raw_post_view),
|
||||
(r'^redirect_view/$', views.redirect_view),
|
||||
(r'^secure_view/$', views.view_with_secure),
|
||||
(r'^permanent_redirect_view/$', RedirectView.as_view(url='/get_view/')),
|
||||
(r'^temporary_redirect_view/$', RedirectView.as_view(url='/get_view/', permanent=False)),
|
||||
(r'^http_redirect_view/$', RedirectView.as_view(url='/secure_view/')),
|
||||
(r'^https_redirect_view/$', RedirectView.as_view(url='https://testserver/secure_view/')),
|
||||
(r'^double_redirect_view/$', views.double_redirect_view),
|
||||
(r'^bad_view/$', views.bad_view),
|
||||
(r'^form_view/$', views.form_view),
|
||||
(r'^form_view_with_template/$', views.form_view_with_template),
|
||||
(r'^formset_view/$', views.formset_view),
|
||||
(r'^login_protected_view/$', views.login_protected_view),
|
||||
(r'^login_protected_method_view/$', views.login_protected_method_view),
|
||||
(r'^login_protected_view_custom_redirect/$', views.login_protected_view_changed_redirect),
|
||||
(r'^permission_protected_view/$', views.permission_protected_view),
|
||||
(r'^permission_protected_view_exception/$', views.permission_protected_view_exception),
|
||||
(r'^permission_protected_method_view/$', views.permission_protected_method_view),
|
||||
(r'^session_view/$', views.session_view),
|
||||
(r'^broken_view/$', views.broken_view),
|
||||
(r'^mail_sending_view/$', views.mail_sending_view),
|
||||
(r'^mass_mail_sending_view/$', views.mass_mail_sending_view),
|
||||
(r'^django_project_redirect/$', views.django_project_redirect),
|
||||
urlpatterns = [
|
||||
url(r'^get_view/$', views.get_view),
|
||||
url(r'^post_view/$', views.post_view),
|
||||
url(r'^header_view/$', views.view_with_header),
|
||||
url(r'^raw_post_view/$', views.raw_post_view),
|
||||
url(r'^redirect_view/$', views.redirect_view),
|
||||
url(r'^secure_view/$', views.view_with_secure),
|
||||
url(r'^permanent_redirect_view/$', RedirectView.as_view(url='/get_view/')),
|
||||
url(r'^temporary_redirect_view/$', RedirectView.as_view(url='/get_view/', permanent=False)),
|
||||
url(r'^http_redirect_view/$', RedirectView.as_view(url='/secure_view/')),
|
||||
url(r'^https_redirect_view/$', RedirectView.as_view(url='https://testserver/secure_view/')),
|
||||
url(r'^double_redirect_view/$', views.double_redirect_view),
|
||||
url(r'^bad_view/$', views.bad_view),
|
||||
url(r'^form_view/$', views.form_view),
|
||||
url(r'^form_view_with_template/$', views.form_view_with_template),
|
||||
url(r'^formset_view/$', views.formset_view),
|
||||
url(r'^login_protected_view/$', views.login_protected_view),
|
||||
url(r'^login_protected_method_view/$', views.login_protected_method_view),
|
||||
url(r'^login_protected_view_custom_redirect/$', views.login_protected_view_changed_redirect),
|
||||
url(r'^permission_protected_view/$', views.permission_protected_view),
|
||||
url(r'^permission_protected_view_exception/$', views.permission_protected_view_exception),
|
||||
url(r'^permission_protected_method_view/$', views.permission_protected_method_view),
|
||||
url(r'^session_view/$', views.session_view),
|
||||
url(r'^broken_view/$', views.broken_view),
|
||||
url(r'^mail_sending_view/$', views.mail_sending_view),
|
||||
url(r'^mass_mail_sending_view/$', views.mass_mail_sending_view),
|
||||
url(r'^django_project_redirect/$', views.django_project_redirect),
|
||||
|
||||
(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
|
||||
(r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
|
||||
)
|
||||
url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
|
||||
url(r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user