mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

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

20
tests/admin_docs/urls.py
View File

@@ -1,16 +1,16 @@
from django.conf.urls import include, patterns, url
from django.conf.urls import include, url
from django.contrib import admin
from . import views
ns_patterns = patterns('',
ns_patterns = [
url(r'^xview/func/$', views.xview_dec(views.xview), name='func'),
)
]
urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)),
(r'^admindocs/', include('django.contrib.admindocs.urls')),
(r'^', include(ns_patterns, namespace='test')),
(r'^xview/func/$', views.xview_dec(views.xview)),
(r'^xview/class/$', views.xview_dec(views.XViewClass.as_view())),
)
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^admindocs/', include('django.contrib.admindocs.urls')),
url(r'^', include(ns_patterns, namespace='test')),
url(r'^xview/func/$', views.xview_dec(views.xview)),
url(r'^xview/class/$', views.xview_dec(views.XViewClass.as_view())),
]