Fixed #22378 -- Updated \d to [0-9]+ in urlpatterns of docs and tests.

Thanks tomwys for the suggestion.

9 files changed, 35 insertions, 35 deletions

diff --git a/tests/urlpatterns_reverse/extra_urls.py b/tests/urlpatterns_reverse/extra_urls.py
index 4eb2f02130..c30a61a99a 100644
--- a/tests/urlpatterns_reverse/extra_urls.py
+++ b/tests/urlpatterns_reverse/extra_urls.py
@@ -8,7 +8,7 @@ from .views import empty_view
 
 
 urlpatterns = [
-    url(r'^e-places/(\d+)/$', empty_view, name='extra-places'),
+    url(r'^e-places/([0-9]+)/$', empty_view, name='extra-places'),
     url(r'^e-people/(?P<name>\w+)/$', empty_view, name="extra-people"),
     url('', include('urlpatterns_reverse.included_urls2')),
     url(r'^prefix/(?P<prefix>\w+)/', include('urlpatterns_reverse.included_urls2')),
diff --git a/tests/urlpatterns_reverse/included_named_urls.py b/tests/urlpatterns_reverse/included_named_urls.py
index d8a6a16481..a4c6afea57 100644
--- a/tests/urlpatterns_reverse/included_named_urls.py
+++ b/tests/urlpatterns_reverse/included_named_urls.py
@@ -6,6 +6,6 @@ from .views import empty_view
 urlpatterns = [
     url(r'^$', empty_view, name="named-url3"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url4"),
-    url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
+    url(r'^(?P<one>[0-9]+)|(?P<two>[0-9]+)/$', empty_view),
     url(r'^included/', include('urlpatterns_reverse.included_named_urls2')),
 ]
diff --git a/tests/urlpatterns_reverse/included_named_urls2.py b/tests/urlpatterns_reverse/included_named_urls2.py
index cb8c893b48..47411ec620 100644
--- a/tests/urlpatterns_reverse/included_named_urls2.py
+++ b/tests/urlpatterns_reverse/included_named_urls2.py
@@ -6,5 +6,5 @@ from .views import empty_view
 urlpatterns = [
     url(r'^$', empty_view, name="named-url5"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url6"),
-    url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
+    url(r'^(?P<one>[0-9]+)|(?P<two>[0-9]+)/$', empty_view),
 ]
diff --git a/tests/urlpatterns_reverse/included_namespace_urls.py b/tests/urlpatterns_reverse/included_namespace_urls.py
index 1b28552ade..29947f47cd 100644
--- a/tests/urlpatterns_reverse/included_namespace_urls.py
+++ b/tests/urlpatterns_reverse/included_namespace_urls.py
@@ -14,14 +14,14 @@ with warnings.catch_warnings(record=True) as w:
 
     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'^normal/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', 'empty_view', name='inc-normal-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/([0-9]+)/(?P<arg2>[0-9]+)/$', 'empty_view', name='inc-mixed-args'),
+        url(r'^no_kwargs/([0-9]+)/([0-9]+)/$', '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>[0-9]+)/(?P<arg2>[0-9]+)/$', view_class_instance, name='inc-view-class'),
 
         (r'^test3/', include(testobj3.urls)),
         (r'^ns-included3/', include('urlpatterns_reverse.included_urls', namespace='inc-ns3')),
diff --git a/tests/urlpatterns_reverse/included_no_kwargs_urls.py b/tests/urlpatterns_reverse/included_no_kwargs_urls.py
index bed77f7a18..0c291e0de2 100644
--- a/tests/urlpatterns_reverse/included_no_kwargs_urls.py
+++ b/tests/urlpatterns_reverse/included_no_kwargs_urls.py
@@ -4,5 +4,5 @@ from .views import empty_view
 
 
 urlpatterns = [
-    url(r'^inner-no-kwargs/(\d+)/', empty_view, name="inner-no-kwargs")
+    url(r'^inner-no-kwargs/([0-9]+)/', empty_view, name="inner-no-kwargs")
 ]
diff --git a/tests/urlpatterns_reverse/included_urls.py b/tests/urlpatterns_reverse/included_urls.py
index bbc8537820..f8e69cb761 100644
--- a/tests/urlpatterns_reverse/included_urls.py
+++ b/tests/urlpatterns_reverse/included_urls.py
@@ -6,5 +6,5 @@ from .views import empty_view
 urlpatterns = [
     url(r'^$', empty_view, name="inner-nothing"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="inner-extra"),
-    url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view, name="inner-disjunction"),
+    url(r'^(?P<one>[0-9]+)|(?P<two>[0-9]+)/$', empty_view, name="inner-disjunction"),
 ]
diff --git a/tests/urlpatterns_reverse/named_urls.py b/tests/urlpatterns_reverse/named_urls.py
index a4de1e1b87..3f31249735 100644
--- a/tests/urlpatterns_reverse/named_urls.py
+++ b/tests/urlpatterns_reverse/named_urls.py
@@ -6,6 +6,6 @@ from .views import empty_view
 urlpatterns = [
     url(r'^$', empty_view, name="named-url1"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url2"),
-    url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
+    url(r'^(?P<one>[0-9]+)|(?P<two>[0-9]+)/$', empty_view),
     url(r'^included/', include('urlpatterns_reverse.included_named_urls')),
 ]
diff --git a/tests/urlpatterns_reverse/namespace_urls.py b/tests/urlpatterns_reverse/namespace_urls.py
index cb4453fe57..19b1b178b7 100644
--- a/tests/urlpatterns_reverse/namespace_urls.py
+++ b/tests/urlpatterns_reverse/namespace_urls.py
@@ -11,7 +11,7 @@ class URLObject(object):
     def urls(self):
         return ([
             url(r'^inner/$', 'empty_view', name='urlobject-view'),
-            url(r'^inner/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='urlobject-view'),
+            url(r'^inner/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', 'empty_view', name='urlobject-view'),
             url(r'^inner/\+\\\$\*/$', 'empty_view', name='urlobject-special-view'),
         ], self.app_name, self.namespace)
     urls = property(urls)
@@ -25,18 +25,18 @@ otherobj2 = URLObject('nodefault', 'other-ns2')
 
 urlpatterns = [
     url(r'^normal/$', views.empty_view, name='normal-view'),
-    url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 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'),
 
     url(r'^\+\\\$\*/$', views.empty_view, name='special-view'),
 
-    url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', views.empty_view, name='mixed-args'),
-    url(r'^no_kwargs/(\d+)/(\d+)/$', views.empty_view, name='no-kwargs'),
+    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'),
 
-    url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', views.view_class_instance, name='view-class'),
+    url(r'^view_class/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.view_class_instance, name='view-class'),
 
-    url(r'^unnamed/normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', views.empty_view),
-    url(r'^unnamed/view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', views.view_class_instance),
+    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),
 
     url(r'^test1/', include(testobj1.urls)),
     url(r'^test2/', include(testobj2.urls)),
@@ -49,9 +49,9 @@ urlpatterns = [
     url(r'^ns-included2/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')),
 
     url(r'^included/', include('urlpatterns_reverse.included_namespace_urls')),
-    url(r'^inc(?P<outer>\d+)/', include('urlpatterns_reverse.included_urls', namespace='inc-ns5')),
+    url(r'^inc(?P<outer>[0-9]+)/', include('urlpatterns_reverse.included_urls', namespace='inc-ns5')),
 
-    url(r'^ns-outer/(?P<outer>\d+)/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-outer')),
+    url(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')),
 ]
diff --git a/tests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py
index cafcb63888..3e5b53975a 100644
--- a/tests/urlpatterns_reverse/urls.py
+++ b/tests/urlpatterns_reverse/urls.py
@@ -14,15 +14,15 @@ with warnings.catch_warnings(record=True):
     warnings.filterwarnings('ignore', module='django.conf.urls')
 
     urlpatterns = patterns('',
-        url(r'^places/(\d+)/$', empty_view, name='places'),
+        url(r'^places/([0-9]+)/$', empty_view, name='places'),
         url(r'^places?/$', empty_view, name="places?"),
         url(r'^places+/$', empty_view, name="places+"),
         url(r'^places*/$', empty_view, name="places*"),
         url(r'^(?:places/)?$', empty_view, name="places2?"),
         url(r'^(?:places/)+$', empty_view, name="places2+"),
         url(r'^(?:places/)*$', empty_view, name="places2*"),
-        url(r'^places/(\d+|[a-z_]+)/', empty_view, name="places3"),
-        url(r'^places/(?P<id>\d+)/$', empty_view, name="places4"),
+        url(r'^places/([0-9]+|[a-z_]+)/', empty_view, name="places3"),
+        url(r'^places/(?P<id>[0-9]+)/$', empty_view, name="places4"),
         url(r'^people/(?P<name>\w+)/$', empty_view, name="people"),
         url(r'^people/(?:name/)', empty_view, name="people2"),
         url(r'^people/(?:name/(\w+)/)?', empty_view, name="people2a"),
@@ -31,26 +31,26 @@ with warnings.catch_warnings(record=True):
         url(r'^hardcoded/$', empty_view, name="hardcoded"),
         url(r'^hardcoded/doc\.pdf$', empty_view, name="hardcoded2"),
         url(r'^people/(?P<state>\w\w)/(?P<name>\w+)/$', empty_view, name="people3"),
-        url(r'^people/(?P<state>\w\w)/(?P<name>\d)/$', empty_view, name="people4"),
+        url(r'^people/(?P<state>\w\w)/(?P<name>[0-9])/$', empty_view, name="people4"),
         url(r'^people/((?P<state>\w\w)/test)?/(\w+)/$', empty_view, name="people6"),
         url(r'^character_set/[abcdef0-9]/$', empty_view, name="range"),
         url(r'^character_set/[\w]/$', empty_view, name="range2"),
-        url(r'^price/\$(\d+)/$', empty_view, name="price"),
-        url(r'^price/[$](\d+)/$', empty_view, name="price2"),
-        url(r'^price/[\$](\d+)/$', empty_view, name="price3"),
-        url(r'^product/(?P<product>\w+)\+\(\$(?P<price>\d+(\.\d+)?)\)/$', empty_view, name="product"),
-        url(r'^headlines/(?P<year>\d+)\.(?P<month>\d+)\.(?P<day>\d+)/$', empty_view, name="headlines"),
+        url(r'^price/\$([0-9]+)/$', empty_view, name="price"),
+        url(r'^price/[$]([0-9]+)/$', empty_view, name="price2"),
+        url(r'^price/[\$]([0-9]+)/$', empty_view, name="price3"),
+        url(r'^product/(?P<product>\w+)\+\(\$(?P<price>[0-9]+(\.[0-9]+)?)\)/$', empty_view, name="product"),
+        url(r'^headlines/(?P<year>[0-9]+)\.(?P<month>[0-9]+)\.(?P<day>[0-9]+)/$', empty_view, name="headlines"),
         url(r'^windows_path/(?P<drive_name>[A-Z]):\\(?P<path>.+)/$', empty_view, name="windows"),
         url(r'^special_chars/(?P<chars>.+)/$', empty_view, name="special"),
-        url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"),
+        url(r'^(?P<name>.+)/[0-9]+/$', empty_view, name="mixed"),
         url(r'^repeats/a{1,2}/$', empty_view, name="repeats"),
         url(r'^repeats/a{2,4}/$', empty_view, name="repeats2"),
         url(r'^repeats/a{2}/$', empty_view, name="repeats3"),
         url(r'^(?i)CaseInsensitive/(\w+)', empty_view, name="insensitive"),
         url(r'^test/1/?', empty_view, name="test"),
         url(r'^(?i)test/2/?$', empty_view, name="test2"),
-        url(r'^outer/(?P<outer>\d+)/', include('urlpatterns_reverse.included_urls')),
-        url(r'^outer-no-kwargs/(\d+)/', include('urlpatterns_reverse.included_no_kwargs_urls')),
+        url(r'^outer/(?P<outer>[0-9]+)/', include('urlpatterns_reverse.included_urls')),
+        url(r'^outer-no-kwargs/([0-9]+)/', include('urlpatterns_reverse.included_no_kwargs_urls')),
         url('', include('urlpatterns_reverse.extra_urls')),
 
         # This is non-reversible, but we shouldn't blow up when parsing it.
@@ -58,13 +58,13 @@ with warnings.catch_warnings(record=True):
 
         # Regression views for #9038. See tests for more details
         url(r'arg_view/$', 'kwargs_view'),
-        url(r'arg_view/(?P<arg1>\d+)/$', 'kwargs_view'),
-        url(r'absolute_arg_view/(?P<arg1>\d+)/$', absolute_kwargs_view),
+        url(r'arg_view/(?P<arg1>[0-9]+)/$', 'kwargs_view'),
+        url(r'absolute_arg_view/(?P<arg1>[0-9]+)/$', absolute_kwargs_view),
         url(r'absolute_arg_view/$', absolute_kwargs_view),
 
         # Tests for #13154. Mixed syntax to test both ways of defining URLs.
-        url(r'defaults_view1/(?P<arg1>\d+)/', 'defaults_view', {'arg2': 1}, name='defaults'),
-        (r'defaults_view2/(?P<arg1>\d+)/', 'defaults_view', {'arg2': 2}, 'defaults'),
+        url(r'defaults_view1/(?P<arg1>[0-9]+)/', 'defaults_view', {'arg2': 1}, name='defaults'),
+        (r'defaults_view2/(?P<arg1>[0-9]+)/', 'defaults_view', {'arg2': 2}, 'defaults'),
 
         url('^includes/', include(other_patterns)),
     )