From 8066fced3398405c5c2153ca33b3441ef7e1b2dc Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 4 Jul 2011 16:20:22 +0000 Subject: [PATCH] Fixed #16392 -- Clarified docs of the "c" date format with regard to naive datetime objects. Thanks, ybon. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16507 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/templates/builtins.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 3ab8a5d73f..bdac556652 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -1251,7 +1251,10 @@ Available format strings: A ``'AM'`` or ``'PM'``. ``'AM'`` b Month, textual, 3 letters, lowercase. ``'jan'`` B Not implemented. - c ISO 8601 Format. ``2008-01-02T10:30:00.000123`` + c ISO 8601 format. (Note: unlike others ``2008-01-02T10:30:00.000123+02:00``, + formatters, such as "Z", "O" or "r", or ``2008-01-02T10:30:00.000123`` if the datetime is naive + the "c" formatter will not add timezone + offset if value is a `naive datetime`_.) d Day of the month, 2 digits with ``'01'`` to ``'31'`` leading zeros. D Day of the week, textual, 3 letters. ``'Fri'`` @@ -1343,6 +1346,8 @@ used, without applying any localization. .. versionchanged:: 1.2 Predefined formats can now be influenced by the current locale. +.. _naive datetime: http://docs.python.org/library/datetime.html#datetime.tzinfo + .. templatefilter:: default default