diff options
| author | Tim Graham <timograham@gmail.com> | 2014-04-01 20:46:34 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-04-03 07:28:10 -0400 |
| commit | d73d0e071c1b4c86d57994a0ab55a74cfe80cdf5 (patch) | |
| tree | f36eebaf1cdd8bd07503b3a538e7d875ff8d29b4 /tests/urlpatterns_reverse/included_namespace_urls.py | |
| parent | e6ced2bb086396b57601d04ad5b3ba347d1eb785 (diff) | |
Fixed #22218 -- Deprecated django.conf.urls.patterns.
Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.
Diffstat (limited to 'tests/urlpatterns_reverse/included_namespace_urls.py')
| -rw-r--r-- | tests/urlpatterns_reverse/included_namespace_urls.py | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/tests/urlpatterns_reverse/included_namespace_urls.py b/tests/urlpatterns_reverse/included_namespace_urls.py index aaa1a03687..1b28552ade 100644 --- a/tests/urlpatterns_reverse/included_namespace_urls.py +++ b/tests/urlpatterns_reverse/included_namespace_urls.py @@ -1,3 +1,5 @@ +import warnings + from django.conf.urls import patterns, url, include from .namespace_urls import URLObject @@ -6,18 +8,22 @@ from .views import view_class_instance testobj3 = URLObject('testapp', 'test-ns3') -urlpatterns = patterns('urlpatterns_reverse.views', - url(r'^normal/$', 'empty_view', name='inc-normal-view'), - url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-normal-view'), +# test deprecated patterns() function. convert to list of urls() in Django 2.0 +with warnings.catch_warnings(record=True) as w: + warnings.filterwarnings('ignore', module='django.conf.urls') + + urlpatterns = patterns('urlpatterns_reverse.views', + url(r'^normal/$', 'empty_view', name='inc-normal-view'), + url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-normal-view'), - url(r'^\+\\\$\*/$', 'empty_view', name='inc-special-view'), + url(r'^\+\\\$\*/$', 'empty_view', name='inc-special-view'), - url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-mixed-args'), - url(r'^no_kwargs/(\d+)/(\d+)/$', 'empty_view', name='inc-no-kwargs'), + url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-mixed-args'), + url(r'^no_kwargs/(\d+)/(\d+)/$', 'empty_view', name='inc-no-kwargs'), - url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', view_class_instance, name='inc-view-class'), + url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', view_class_instance, name='inc-view-class'), - (r'^test3/', include(testobj3.urls)), - (r'^ns-included3/', include('urlpatterns_reverse.included_urls', namespace='inc-ns3')), - (r'^ns-included4/', include('urlpatterns_reverse.namespace_urls', namespace='inc-ns4')), -) + (r'^test3/', include(testobj3.urls)), + (r'^ns-included3/', include('urlpatterns_reverse.included_urls', namespace='inc-ns3')), + (r'^ns-included4/', include('urlpatterns_reverse.namespace_urls', namespace='inc-ns4')), + ) |
