diff options
Diffstat (limited to 'tests/urlpatterns_reverse/namespace_urls.py')
| -rw-r--r-- | tests/urlpatterns_reverse/namespace_urls.py | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tests/urlpatterns_reverse/namespace_urls.py b/tests/urlpatterns_reverse/namespace_urls.py index a92df2716a..a8fd7bb878 100644 --- a/tests/urlpatterns_reverse/namespace_urls.py +++ b/tests/urlpatterns_reverse/namespace_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.urls import include, path, re_path from . import views from .utils import URLObject @@ -14,48 +14,48 @@ newappobj1 = URLObject('newapp') app_name = 'namespace_urls' urlpatterns = [ - url(r'^normal/$', views.empty_view, name='normal-view'), - url(r'^normal/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.empty_view, name='normal-view'), - url(r'^resolver_match/$', views.pass_resolver_match_view, name='test-resolver-match'), + path('normal/', views.empty_view, name='normal-view'), + re_path(r'^normal/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.empty_view, name='normal-view'), + path('resolver_match/', views.pass_resolver_match_view, name='test-resolver-match'), - url(r'^\+\\\$\*/$', views.empty_view, name='special-view'), + re_path(r'^\+\\\$\*/$', views.empty_view, name='special-view'), - url(r'^mixed_args/([0-9]+)/(?P<arg2>[0-9]+)/$', views.empty_view, name='mixed-args'), - url(r'^no_kwargs/([0-9]+)/([0-9]+)/$', views.empty_view, name='no-kwargs'), + re_path(r'^mixed_args/([0-9]+)/(?P<arg2>[0-9]+)/$', views.empty_view, name='mixed-args'), + re_path(r'^no_kwargs/([0-9]+)/([0-9]+)/$', views.empty_view, name='no-kwargs'), - url(r'^view_class/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.view_class_instance, name='view-class'), + re_path(r'^view_class/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.view_class_instance, name='view-class'), - url(r'^unnamed/normal/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.empty_view), - url(r'^unnamed/view_class/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.view_class_instance), + re_path(r'^unnamed/normal/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.empty_view), + re_path(r'^unnamed/view_class/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.view_class_instance), - url(r'^test1/', include(*testobj1.urls)), - url(r'^test2/', include(*testobj2.urls)), - url(r'^default/', include(*default_testobj.urls)), + path('test1/', include(*testobj1.urls)), + path('test2/', include(*testobj2.urls)), + path('default/', include(*default_testobj.urls)), - url(r'^other1/', include(*otherobj1.urls)), - url(r'^other[246]/', include(*otherobj2.urls)), + path('other1/', include(*otherobj1.urls)), + re_path(r'^other[246]/', include(*otherobj2.urls)), - url(r'^newapp1/', include(newappobj1.app_urls, 'new-ns1')), - url(r'^new-default/', include(newappobj1.app_urls)), + path('newapp1/', include(newappobj1.app_urls, 'new-ns1')), + path('new-default/', include(newappobj1.app_urls)), - url(r'^app-included[135]/', include('urlpatterns_reverse.included_app_urls', namespace='app-ns1')), - url(r'^app-included2/', include('urlpatterns_reverse.included_app_urls', namespace='app-ns2')), + re_path(r'^app-included[135]/', include('urlpatterns_reverse.included_app_urls', namespace='app-ns1')), + path('app-included2/', include('urlpatterns_reverse.included_app_urls', namespace='app-ns2')), - url(r'^ns-included[135]/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')), - url(r'^ns-included2/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')), + re_path(r'^ns-included[135]/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')), + path('ns-included2/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')), - url(r'^app-included/', include('urlpatterns_reverse.included_namespace_urls', 'inc-app')), + path('app-included/', include('urlpatterns_reverse.included_namespace_urls', 'inc-app')), - url(r'^included/', include('urlpatterns_reverse.included_namespace_urls')), - url( + path('included/', include('urlpatterns_reverse.included_namespace_urls')), + re_path( r'^inc(?P<outer>[0-9]+)/', include(('urlpatterns_reverse.included_urls', 'included_urls'), namespace='inc-ns5') ), - url(r'^included/([0-9]+)/', include('urlpatterns_reverse.included_namespace_urls')), + re_path(r'^included/([0-9]+)/', include('urlpatterns_reverse.included_namespace_urls')), - url( + re_path( r'^ns-outer/(?P<outer>[0-9]+)/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-outer') ), - url(r'^\+\\\$\*/', include('urlpatterns_reverse.namespace_urls', namespace='special')), + re_path(r'^\+\\\$\*/', include('urlpatterns_reverse.namespace_urls', namespace='special')), ] |