diff options
Diffstat (limited to 'tests/template_tests')
| -rw-r--r-- | tests/template_tests/alternate_urls.py | 6 | ||||
| -rw-r--r-- | tests/template_tests/urls.py | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/template_tests/alternate_urls.py b/tests/template_tests/alternate_urls.py index cb73513879..181e5c50a5 100644 --- a/tests/template_tests/alternate_urls.py +++ b/tests/template_tests/alternate_urls.py @@ -1,11 +1,11 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ # View returning a template response - url(r'^template_response_view/$', views.template_response_view), + path('template_response_view/', views.template_response_view), # A view that can be hard to find... - url(r'^snark/', views.snark, name='snark'), + path('snark/', views.snark, name='snark'), ] diff --git a/tests/template_tests/urls.py b/tests/template_tests/urls.py index a367696d43..c9d6900baf 100644 --- a/tests/template_tests/urls.py +++ b/tests/template_tests/urls.py @@ -1,23 +1,23 @@ -from django.conf.urls import include, url +from django.urls import include, path, re_path from . import views ns_patterns = [ # Test urls for testing reverse lookups - url(r'^$', views.index, name='index'), - url(r'^client/([0-9,]+)/$', views.client, name='client'), - url(r'^client/(?P<id>[0-9]+)/(?P<action>[^/]+)/$', views.client_action, name='client_action'), - url(r'^client/(?P<client_id>[0-9]+)/(?P<action>[^/]+)/$', views.client_action, name='client_action'), - url(r'^named-client/([0-9]+)/$', views.client2, name="named.client"), + path('', views.index, name='index'), + re_path(r'^client/([0-9,]+)/$', views.client, name='client'), + re_path(r'^client/(?P<id>[0-9]+)/(?P<action>[^/]+)/$', views.client_action, name='client_action'), + re_path(r'^client/(?P<client_id>[0-9]+)/(?P<action>[^/]+)/$', views.client_action, name='client_action'), + re_path(r'^named-client/([0-9]+)/$', views.client2, name="named.client"), ] urlpatterns = ns_patterns + [ # Unicode strings are permitted everywhere. - url(r'^Юникод/(\w+)/$', views.client2, name="метка_оператора"), - url(r'^Юникод/(?P<tag>\S+)/$', views.client2, name="метка_оператора_2"), + re_path(r'^Юникод/(\w+)/$', views.client2, name="метка_оператора"), + re_path(r'^Юникод/(?P<tag>\S+)/$', views.client2, name="метка_оператора_2"), # Test urls for namespaces and current_app - url(r'ns1/', include((ns_patterns, 'app'), 'ns1')), - url(r'ns2/', include((ns_patterns, 'app'))), + path('ns1/', include((ns_patterns, 'app'), 'ns1')), + path('ns2/', include((ns_patterns, 'app'))), ] |