merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-29 08:17:08 +01:00
commit 3a19a89eac
4 changed files with 6 additions and 6 deletions

View file

@ -1898,7 +1898,7 @@ Notes:
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 using the locale's default encoding (for
example, if the current locale is ``js_JP``, the default encoding could be
example, if the current locale is ``ja_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).