diff options
| author | Sjoerd Job Postmus <sjoerdjob@sjec.nl> | 2016-10-20 19:29:04 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-09-20 18:04:42 -0400 |
| commit | df41b5a05d4e00e80e73afe629072e37873e767a (patch) | |
| tree | baaf71ae695e2d3af604ea0d663284cb406c71e4 /tests/view_tests/urls.py | |
| parent | c4c128d67c7dc2830631c6859a204c9d259f1fb1 (diff) | |
Fixed #28593 -- Added a simplified URL routing syntax per DEP 0201.
Thanks Aymeric Augustin for shepherding the DEP and patch review.
Thanks Marten Kenbeek and Tim Graham for contributing to the code.
Thanks Tom Christie, Shai Berger, and Tim Graham for the docs.
Diffstat (limited to 'tests/view_tests/urls.py')
| -rw-r--r-- | tests/view_tests/urls.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/view_tests/urls.py b/tests/view_tests/urls.py index 1c1f0d0e12..c487dd7cb9 100644 --- a/tests/view_tests/urls.py +++ b/tests/view_tests/urls.py @@ -1,16 +1,17 @@ +import os from functools import partial -from os import path from django.conf.urls import include, url from django.conf.urls.i18n import i18n_patterns +from django.urls import path, re_path from django.utils.translation import gettext_lazy as _ from django.views import defaults, i18n, static from . import views -base_dir = path.dirname(path.abspath(__file__)) -media_dir = path.join(base_dir, 'media') -locale_dir = path.join(base_dir, 'locale') +base_dir = os.path.dirname(os.path.abspath(__file__)) +media_dir = os.path.join(base_dir, 'media') +locale_dir = os.path.join(base_dir, 'locale') urlpatterns = [ url(r'^$', views.index_page), @@ -64,4 +65,7 @@ urlpatterns += [ ), url(r'^render_no_template/$', views.render_no_template, name='render_no_template'), url(r'^test-setlang/(?P<parameter>[^/]+)/$', views.with_parameter, name='with_parameter'), + # Patterns to test the technical 404. + re_path(r'^regex-post/(?P<pk>[0-9]+)/$', views.index_page, name='regex-post'), + path('path-post/<int:pk>/', views.index_page, name='path-post'), ] |
