Updated test URL patterns to use path() and re_path().

9 files changed, 29 insertions, 30 deletions

diff --git a/tests/i18n/patterns/urls/default.py b/tests/i18n/patterns/urls/default.py
index b7fc38cf89..b0c2f2585e 100644
--- a/tests/i18n/patterns/urls/default.py
+++ b/tests/i18n/patterns/urls/default.py
@@ -1,20 +1,20 @@
-from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
+from django.urls import include, path, re_path
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
 view = TemplateView.as_view(template_name='dummy.html')
 
 urlpatterns = [
-    url(r'^not-prefixed/$', view, name='not-prefixed'),
-    url(r'^not-prefixed-include/', include('i18n.patterns.urls.included')),
-    url(_(r'^translated/$'), view, name='no-prefix-translated'),
-    url(_(r'^translated/(?P<slug>[\w-]+)/$'), view, name='no-prefix-translated-slug'),
+    path('not-prefixed/', view, name='not-prefixed'),
+    path('not-prefixed-include/', include('i18n.patterns.urls.included')),
+    re_path(_(r'^translated/$'), view, name='no-prefix-translated'),
+    re_path(_(r'^translated/(?P<slug>[\w-]+)/$'), view, name='no-prefix-translated-slug'),
 ]
 
 urlpatterns += i18n_patterns(
-    url(r'^prefixed/$', view, name='prefixed'),
-    url(r'^prefixed\.xml$', view, name='prefixed_xml'),
-    url(_(r'^users/$'), view, name='users'),
-    url(_(r'^account/'), include('i18n.patterns.urls.namespace', namespace='account')),
+    path('prefixed/', view, name='prefixed'),
+    path('prefixed.xml', view, name='prefixed_xml'),
+    re_path(_(r'^users/$'), view, name='users'),
+    re_path(_(r'^account/'), include('i18n.patterns.urls.namespace', namespace='account')),
 )
diff --git a/tests/i18n/patterns/urls/disabled.py b/tests/i18n/patterns/urls/disabled.py
index f5059dd852..48b0201fe3 100644
--- a/tests/i18n/patterns/urls/disabled.py
+++ b/tests/i18n/patterns/urls/disabled.py
@@ -1,9 +1,9 @@
-from django.conf.urls import url
 from django.conf.urls.i18n import i18n_patterns
+from django.urls import path
 from django.views.generic import TemplateView
 
 view = TemplateView.as_view(template_name='dummy.html')
 
 urlpatterns = i18n_patterns(
-    url(r'^prefixed/$', view, name='prefixed'),
+    path('prefixed/', view, name='prefixed'),
 )
diff --git a/tests/i18n/patterns/urls/included.py b/tests/i18n/patterns/urls/included.py
index ded29a8bf1..75658dc961 100644
--- a/tests/i18n/patterns/urls/included.py
+++ b/tests/i18n/patterns/urls/included.py
@@ -1,8 +1,8 @@
-from django.conf.urls import url
+from django.urls import path
 from django.views.generic import TemplateView
 
 view = TemplateView.as_view(template_name='dummy.html')
 
 urlpatterns = [
-    url(r'^foo/$', view, name='not-prefixed-included-url'),
+    path('foo/', view, name='not-prefixed-included-url'),
 ]
diff --git a/tests/i18n/patterns/urls/namespace.py b/tests/i18n/patterns/urls/namespace.py
index 9858c8cd5e..19cd5694da 100644
--- a/tests/i18n/patterns/urls/namespace.py
+++ b/tests/i18n/patterns/urls/namespace.py
@@ -1,5 +1,4 @@
-from django.conf.urls import url
-from django.urls import path
+from django.urls import path, re_path
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
@@ -7,7 +6,7 @@ view = TemplateView.as_view(template_name='dummy.html')
 
 app_name = 'account'
 urlpatterns = [
-    url(_(r'^register/$'), view, name='register'),
-    url(_(r'^register-without-slash$'), view, name='register-without-slash'),
+    re_path(_(r'^register/$'), view, name='register'),
+    re_path(_(r'^register-without-slash$'), view, name='register-without-slash'),
     path(_('register-as-path/'), view, name='register-as-path'),
 ]
diff --git a/tests/i18n/patterns/urls/path_unused.py b/tests/i18n/patterns/urls/path_unused.py
index e2186d3d02..2784d286a1 100644
--- a/tests/i18n/patterns/urls/path_unused.py
+++ b/tests/i18n/patterns/urls/path_unused.py
@@ -1,8 +1,8 @@
-from django.conf.urls import url
+from django.urls import re_path
 from django.views.generic import TemplateView
 
 view = TemplateView.as_view(template_name='dummy.html')
 
 urlpatterns = [
-    url(r'^nl/foo/', view, name='not-translated'),
+    re_path('^nl/foo/', view, name='not-translated'),
 ]
diff --git a/tests/i18n/patterns/urls/wrong.py b/tests/i18n/patterns/urls/wrong.py
index 99504dbb87..46b4b69718 100644
--- a/tests/i18n/patterns/urls/wrong.py
+++ b/tests/i18n/patterns/urls/wrong.py
@@ -1,7 +1,7 @@
-from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
+from django.urls import include, re_path
 from django.utils.translation import gettext_lazy as _
 
 urlpatterns = i18n_patterns(
-    url(_(r'^account/'), include('i18n.patterns.urls.wrong_namespace', namespace='account')),
+    re_path(_(r'^account/'), include('i18n.patterns.urls.wrong_namespace', namespace='account')),
 )
diff --git a/tests/i18n/patterns/urls/wrong_namespace.py b/tests/i18n/patterns/urls/wrong_namespace.py
index f36c1a88a2..7800d90e3c 100644
--- a/tests/i18n/patterns/urls/wrong_namespace.py
+++ b/tests/i18n/patterns/urls/wrong_namespace.py
@@ -1,5 +1,5 @@
-from django.conf.urls import url
 from django.conf.urls.i18n import i18n_patterns
+from django.urls import re_path
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
@@ -7,5 +7,5 @@ view = TemplateView.as_view(template_name='dummy.html')
 
 app_name = 'account'
 urlpatterns = i18n_patterns(
-    url(_(r'^register/$'), view, name='register'),
+    re_path(_(r'^register/$'), view, name='register'),
 )
diff --git a/tests/i18n/urls.py b/tests/i18n/urls.py
index 233ad699a3..6a1dd75e24 100644
--- a/tests/i18n/urls.py
+++ b/tests/i18n/urls.py
@@ -1,9 +1,9 @@
-from django.conf.urls import url
 from django.conf.urls.i18n import i18n_patterns
 from django.http import HttpResponse, StreamingHttpResponse
+from django.urls import path
 from django.utils.translation import gettext_lazy as _
 
 urlpatterns = i18n_patterns(
-    url(r'^simple/$', lambda r: HttpResponse()),
-    url(r'^streaming/$', lambda r: StreamingHttpResponse([_("Yes"), "/", _("No")])),
+    path('simple/', lambda r: HttpResponse()),
+    path('streaming/', lambda r: StreamingHttpResponse([_('Yes'), '/', _('No')])),
 )
diff --git a/tests/i18n/urls_default_unprefixed.py b/tests/i18n/urls_default_unprefixed.py
index 9f0e6f3902..8801d078f4 100644
--- a/tests/i18n/urls_default_unprefixed.py
+++ b/tests/i18n/urls_default_unprefixed.py
@@ -1,11 +1,11 @@
-from django.conf.urls import url
 from django.conf.urls.i18n import i18n_patterns
 from django.http import HttpResponse
+from django.urls import path, re_path
 from django.utils.translation import gettext_lazy as _
 
 urlpatterns = i18n_patterns(
-    url(r'^(?P<arg>[\w-]+)-page', lambda request, **arg: HttpResponse(_("Yes"))),
-    url(r'^simple/$', lambda r: HttpResponse(_("Yes"))),
-    url(r'^(.+)/(.+)/$', lambda *args: HttpResponse()),
+    re_path(r'^(?P<arg>[\w-]+)-page', lambda request, **arg: HttpResponse(_('Yes'))),
+    path('simple/', lambda r: HttpResponse(_('Yes'))),
+    re_path(r'^(.+)/(.+)/$', lambda *args: HttpResponse()),
     prefix_default_language=False,
 )