|
2 | 2 |
|
3 | 3 | from __future__ import absolute_import, unicode_literals
|
4 | 4 |
|
5 |
| -from django.conf.urls import include, patterns, url |
6 |
| -from django.contrib import admin |
| 5 | +from django.conf.urls import include, url |
7 | 6 |
|
8 | 7 | import debug_toolbar
|
9 | 8 |
|
| 9 | +from . import views |
10 | 10 | from .models import NonAsciiRepr
|
11 | 11 |
|
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), |
24 | 21 | url(r'^__debug__/', include(debug_toolbar.urls)),
|
25 |
| -) |
| 22 | +] |
0 commit comments