Skip to content

Commit bb21def

Browse files
committed
Use modern URLconf style.
1 parent af642fd commit bb21def

File tree

2 files changed

+20
-24
lines changed

2 files changed

+20
-24
lines changed

example/urls.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
from django.conf.urls import patterns, include
1+
from django.conf.urls import include, url
22
from django.contrib import admin
33
from django.views.generic import TemplateView
44

5-
admin.autodiscover()
65

7-
urlpatterns = patterns('', # noqa
8-
(r'^$', TemplateView.as_view(template_name='index.html')),
9-
(r'^jquery/$', TemplateView.as_view(template_name='jquery/index.html')),
10-
(r'^mootools/$', TemplateView.as_view(template_name='mootools/index.html')),
11-
(r'^prototype/$', TemplateView.as_view(template_name='prototype/index.html')),
12-
(r'^admin/', include(admin.site.urls)),
13-
)
6+
urlpatterns = [
7+
url(r'^$', TemplateView.as_view(template_name='index.html')),
8+
url(r'^jquery/$', TemplateView.as_view(template_name='jquery/index.html')),
9+
url(r'^mootools/$', TemplateView.as_view(template_name='mootools/index.html')),
10+
url(r'^prototype/$', TemplateView.as_view(template_name='prototype/index.html')),
11+
url(r'^admin/', include(admin.site.urls)),
12+
]

tests/urls.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,21 @@
22

33
from __future__ import absolute_import, unicode_literals
44

5-
from django.conf.urls import include, patterns, url
6-
from django.contrib import admin
5+
from django.conf.urls import include, url
76

87
import debug_toolbar
98

9+
from . import views
1010
from .models import NonAsciiRepr
1111

12-
13-
admin.autodiscover()
14-
15-
urlpatterns = patterns('tests.views', # noqa
16-
url(r'^resolving1/(.+)/(.+)/$', 'resolving_view', name='positional-resolving'),
17-
url(r'^resolving2/(?P<arg1>.+)/(?P<arg2>.+)/$', 'resolving_view'),
18-
url(r'^resolving3/(.+)/$', 'resolving_view', {'arg2': 'default'}),
19-
url(r'^regular/(?P<title>.*)/$', 'regular_view'),
20-
url(r'^non_ascii_request/$', 'regular_view', {'title': NonAsciiRepr()}),
21-
url(r'^new_user/$', 'new_user'),
22-
url(r'^execute_sql/$', 'execute_sql'),
23-
url(r'^cached_view/$', 'cached_view'),
12+
urlpatterns = [
13+
url(r'^resolving1/(.+)/(.+)/$', views.resolving_view, name='positional-resolving'),
14+
url(r'^resolving2/(?P<arg1>.+)/(?P<arg2>.+)/$', views.resolving_view),
15+
url(r'^resolving3/(.+)/$', views.resolving_view, {'arg2': 'default'}),
16+
url(r'^regular/(?P<title>.*)/$', views.regular_view),
17+
url(r'^non_ascii_request/$', views.regular_view, {'title': NonAsciiRepr()}),
18+
url(r'^new_user/$', views.new_user),
19+
url(r'^execute_sql/$', views.execute_sql),
20+
url(r'^cached_view/$', views.cached_view),
2421
url(r'^__debug__/', include(debug_toolbar.urls)),
25-
)
22+
]

0 commit comments

Comments
 (0)