From 66ec9ee441618894c1ccebdcdd5eb4d7fbf4a6d3 Mon Sep 17 00:00:00 2001 From: chriscauley Date: Mon, 14 Apr 2014 14:12:44 -0400 Subject: Fixed #22378 -- Updated \d to [0-9]+ in urlpatterns of docs and tests. Thanks tomwys for the suggestion. --- docs/ref/class-based-views/base.txt | 4 ++-- docs/ref/class-based-views/generic-date-based.txt | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/ref/class-based-views') diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt index e8f5271e97..0e43f5b4b3 100644 --- a/docs/ref/class-based-views/base.txt +++ b/docs/ref/class-based-views/base.txt @@ -198,8 +198,8 @@ RedirectView from article.views import ArticleCounterRedirectView, ArticleDetail urlpatterns = [ - url(r'^counter/(?P\d+)/$', ArticleCounterRedirectView.as_view(), name='article-counter'), - url(r'^details/(?P\d+)/$', ArticleDetail.as_view(), name='article-detail'), + url(r'^counter/(?P[0-9]+)/$', ArticleCounterRedirectView.as_view(), name='article-counter'), + url(r'^details/(?P[0-9]+)/$', ArticleDetail.as_view(), name='article-detail'), url(r'^go-to-django/$', RedirectView.as_view(url='http://djangoproject.com'), name='go-to-django'), ] diff --git a/docs/ref/class-based-views/generic-date-based.txt b/docs/ref/class-based-views/generic-date-based.txt index 9d6d447052..ecaeddfecc 100644 --- a/docs/ref/class-based-views/generic-date-based.txt +++ b/docs/ref/class-based-views/generic-date-based.txt @@ -171,7 +171,7 @@ YearArchiveView from myapp.views import ArticleYearArchiveView urlpatterns = [ - url(r'^(?P\d{4})/$', + url(r'^(?P[0-9]{4})/$', ArticleYearArchiveView.as_view(), name="article_year_archive"), ] @@ -267,11 +267,11 @@ MonthArchiveView urlpatterns = [ # Example: /2012/aug/ - url(r'^(?P\d{4})/(?P[-\w]+)/$', + url(r'^(?P[0-9]{4})/(?P[-\w]+)/$', ArticleMonthArchiveView.as_view(), name="archive_month"), # Example: /2012/08/ - url(r'^(?P\d{4})/(?P\d+)/$', + url(r'^(?P[0-9]{4})/(?P[0-9]+)/$', ArticleMonthArchiveView.as_view(month_format='%m'), name="archive_month_numeric"), ] @@ -361,7 +361,7 @@ WeekArchiveView urlpatterns = [ # Example: /2012/week/23/ - url(r'^(?P\d{4})/week/(?P\d+)/$', + url(r'^(?P[0-9]{4})/week/(?P[0-9]+)/$', ArticleWeekArchiveView.as_view(), name="archive_week"), ] @@ -475,7 +475,7 @@ DayArchiveView urlpatterns = [ # Example: /2012/nov/10/ - url(r'^(?P\d{4})/(?P[-\w]+)/(?P\d+)/$', + url(r'^(?P[0-9]{4})/(?P[-\w]+)/(?P[0-9]+)/$', ArticleDayArchiveView.as_view(), name="archive_day"), ] @@ -597,7 +597,7 @@ DateDetailView from django.views.generic.dates import DateDetailView urlpatterns = [ - url(r'^(?P\d+)/(?P[-\w]+)/(?P\d+)/(?P\d+)/$', + url(r'^(?P[0-9]+)/(?P[-\w]+)/(?P[0-9]+)/(?P[0-9]+)/$', DateDetailView.as_view(model=Article, date_field="pub_date"), name="archive_date_detail"), ] -- cgit v1.3