Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.3.X] Fixed #16109: Corrected an inconsistency in URLconf examples …

…for matching a numeric month. Backport of [16811] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 16787c690396d5ce4d24070bd910e23ba6559c84 1 parent f242c02
@ubernostrum ubernostrum authored
Showing with 8 additions and 8 deletions.
  1. +3 −3 docs/ref/models/instances.txt
  2. +5 −5 docs/topics/http/urls.txt
View
6 docs/ref/models/instances.txt
@@ -470,7 +470,7 @@ the URL. For example, if your URLconf contained a line such as::
Similarly, if you had a URLconf entry that looked like::
- (r'/archive/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', archive_view)
+ (r'/archive/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', archive_view)
...you could reference this using ``permalink()`` as follows::
@@ -478,8 +478,8 @@ Similarly, if you had a URLconf entry that looked like::
def get_absolute_url(self):
return ('archive_view', (), {
'year': self.created.year,
- 'month': self.created.month,
- 'day': self.created.day})
+ 'month': self.created.strftime('%m'),
+ 'day': self.created.strftime('%d')})
Notice that we specify an empty sequence for the second parameter in this case,
because we only want to pass keyword parameters, not positional ones.
View
10 docs/topics/http/urls.txt
@@ -103,8 +103,8 @@ Example requests:
* ``/articles/2003`` would not match any of these patterns, because each
pattern requires that the URL end with a slash.
- * ``/articles/2003/03/3/`` would match the final pattern. Django would call
- the function ``news.views.article_detail(request, '2003', '03', '3')``.
+ * ``/articles/2003/03/03/`` would match the final pattern. Django would call
+ the function ``news.views.article_detail(request, '2003', '03', '03')``.
.. _Dive Into Python's explanation: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3
@@ -127,7 +127,7 @@ Here's the above example URLconf, rewritten to use named groups::
(r'^articles/2003/$', 'news.views.special_case_2003'),
(r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
(r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'),
- (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)/$', 'news.views.article_detail'),
+ (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'),
)
This accomplishes exactly the same thing as the previous example, with one
@@ -138,8 +138,8 @@ arguments rather than positional arguments. For example:
``news.views.month_archive(request, year='2005', month='03')``, instead
of ``news.views.month_archive(request, '2005', '03')``.
- * A request to ``/articles/2003/03/3/`` would call the function
- ``news.views.article_detail(request, year='2003', month='03', day='3')``.
+ * A request to ``/articles/2003/03/03/`` would call the function
+ ``news.views.article_detail(request, year='2003', month='03', day='03')``.
In practice, this means your URLconfs are slightly more explicit and less prone
to argument-order bugs -- and you can reorder the arguments in your views'
Please sign in to comment.
Something went wrong with that request. Please try again.