From: David Wolever <david@wolever.net>
Date: Thu, 23 May 2013 21:42:14 +0000 (-0400)
Subject: Clarify that strftime's encoding is based on locale
X-Git-Tag: v2.7.6rc1~248^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd9cbf0064c6daa37ac7d6151205acf2f7b24e1c;p=thirdparty%2FPython%2Fcpython.git

Clarify that strftime's encoding is based on locale
---

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index ad1e0474ec11..e33f3f06ba19 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1718,10 +1718,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 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).
+   contain Unicode characters encoded using the locale's default encoding (for
+   example, if the current locale is ``js_JP``, the default encoding could be
+   any one of ``eucJP``, ``SJIS``, or ``utf-8``; use :meth:`locale.getlocale`
+   to determine the current locale's encoding).
 
 (2)
    When used with the :meth:`strptime` method, the ``%p`` directive only affects