mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 02:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Tim Graham 2018-12-07 17:52:28 -05:00
parent 1136d57f01
commit 043bd70942
104 changed files with 692 additions and 673 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/check_framework/test_urls.py
View file

@ -20,7 +20,7 @@ class CheckUrlConfigTests(SimpleTestCase):
@override_settings(ROOT_URLCONF='check_framework.urls.warning_in_include')
def test_check_resolver_recursive(self):
# The resolver is checked recursively (examining url()s in include()).
# The resolver is checked recursively (examining URL patterns in include()).
result = check_url_config(None)
self.assertEqual(len(result), 1)
warning = result[0]

5
tests/check_framework/urls/beginning_with_slash.py
View file

@ -1,7 +1,6 @@
from django.conf.urls import url
from django.urls import path
from django.urls import path, re_path
urlpatterns = [
path('/path-starting-with-slash/', lambda x: x),
url(r'/url-starting-with-slash/$', lambda x: x),
re_path(r'/url-starting-with-slash/$', lambda x: x),
]

4
tests/check_framework/urls/include_with_dollar.py
View file

@ -1,5 +1,5 @@
from django.conf.urls import include, url
from django.urls import include, re_path
urlpatterns = [
url(r'^include-with-dollar$', include([])),
re_path('^include-with-dollar$', include([])),
]

4
tests/check_framework/urls/name_with_colon.py
View file

@ -1,5 +1,5 @@
from django.conf.urls import url
from django.urls import re_path
urlpatterns = [
url(r'^$', lambda x: x, name='name_with:colon'),
re_path('^$', lambda x: x, name='name_with:colon'),
]

8
tests/check_framework/urls/no_warnings.py
View file

@ -1,9 +1,9 @@
from django.conf.urls import include, url
from django.urls import include, path, re_path
urlpatterns = [
url(r'^foo/', lambda x: x, name='foo'),
path('foo/', lambda x: x, name='foo'),
# This dollar is ok as it is escaped
url(r'^\$', include([
url(r'^bar/$', lambda x: x, name='bar'),
re_path(r'^\$', include([
path('bar/', lambda x: x, name='bar'),
])),
]

4
tests/check_framework/urls/no_warnings_i18n.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import url
from django.conf.urls.i18n import i18n_patterns
from django.urls import path
from django.utils.translation import gettext_lazy as _
urlpatterns = i18n_patterns(
url(_('translated/'), lambda x: x, name='i18n_prefixed'),
path(_('translated/'), lambda x: x, name='i18n_prefixed'),
)

14
tests/check_framework/urls/non_unique_namespaces.py
View file

@ -1,13 +1,13 @@
from django.conf.urls import include, url
from django.urls import include, path
common_url_patterns = ([
url(r'^app-ns1/', include([])),
url(r'^app-url/', include([])),
path('app-ns1/', include([])),
path('app-url/', include([])),
], 'app-ns1')
urlpatterns = [
url(r'^app-ns1-0/', include(common_url_patterns)),
url(r'^app-ns1-1/', include(common_url_patterns)),
url(r'^app-some-url/', include(([], 'app'), namespace='app-1')),
url(r'^app-some-url-2/', include(([], 'app'), namespace='app-1'))
path('app-ns1-0/', include(common_url_patterns)),
path('app-ns1-1/', include(common_url_patterns)),
path('app-some-url/', include(([], 'app'), namespace='app-1')),
path('app-some-url-2/', include(([], 'app'), namespace='app-1'))
]

18
tests/check_framework/urls/unique_namespaces.py
View file

@ -1,20 +1,20 @@
from django.conf.urls import include, url
from django.urls import include, path
common_url_patterns = ([
url(r'^app-ns1/', include([])),
url(r'^app-url/', include([])),
path('app-ns1/', include([])),
path('app-url/', include([])),
], 'common')
nested_url_patterns = ([
url(r'^common/', include(common_url_patterns, namespace='nested')),
path('common/', include(common_url_patterns, namespace='nested')),
], 'nested')
urlpatterns = [
url(r'^app-ns1-0/', include(common_url_patterns, namespace='app-include-1')),
url(r'^app-ns1-1/', include(common_url_patterns, namespace='app-include-2')),
path('app-ns1-0/', include(common_url_patterns, namespace='app-include-1')),
path('app-ns1-1/', include(common_url_patterns, namespace='app-include-2')),
# 'nested' is included twice but namespaced by nested-1 and nested-2.
url(r'^app-ns1-2/', include(nested_url_patterns, namespace='nested-1')),
url(r'^app-ns1-3/', include(nested_url_patterns, namespace='nested-2')),
path('app-ns1-2/', include(nested_url_patterns, namespace='nested-1')),
path('app-ns1-3/', include(nested_url_patterns, namespace='nested-2')),
# namespaced URLs inside non-namespaced URLs.
url(r'^app-ns1-4/', include([url(r'^abc/', include(common_url_patterns))])),
path('app-ns1-4/', include([path('abc/', include(common_url_patterns))])),
]

6
tests/check_framework/urls/warning_in_include.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import include, url
from django.urls import include, path, re_path
urlpatterns = [
url(r'^', include([
url(r'^include-with-dollar$', include([])),
path('', include([
re_path('^include-with-dollar$', include([])),
])),
]