From: David Wolever <david@wolever.net>
Date: Sun, 14 Apr 2013 02:40:11 +0000 (-0400)
Subject: Correct misleading strftime documentation.
X-Git-Tag: v2.7.6rc1~248^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d2e78c275ba060769411291c193242e59cf0208;p=thirdparty%2FPython%2Fcpython.git

Correct misleading strftime documentation.

strftime using locale-aware formatting directives will often, but not awlays,
produce UTF-8-encoded Unicode.
---

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index a60fa38dc384..cf41d434c0ee 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1730,8 +1730,10 @@ Notes:
    Because the format depends on the current locale, care should be taken when
    making assumptions about the output value. Field orderings will vary (for
    example, "month/day/year" versus "day/month/year"), and the output may
-   contain UTF-8 encoded unicode characters (for example, the ``ja_JP`` locale
-   may include Japanese characters).
+   contain Unicode characters (encoded, by default, using UTF-8, but this may
+   vary based on the locale; for example, the ``ja_JP`` locale contains UTF-8
+   encoded Japanese characters, but ``ja_JP.SJIS`` contains Shift JIS encoded
+   Japanese characters).
 
 (2)
    When used with the :meth:`strptime` method, the ``%p`` directive only affects