[Python-checkins] cpython (merge 3.3 -> default): (Merge 3.3) Issue #19728: Fix sys.getfilesystemencoding() documentation

[victor.stinner]

http://hg.python.org/cpython/rev/e3c48bddf621
changeset:   87693:e3c48bddf621
parent:      87691:9685c9d1d67f
parent:      87692:b231e0c3fd26
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Dec 02 12:17:29 2013 +0100
summary:
  (Merge 3.3) Issue #19728: Fix sys.getfilesystemencoding() documentation

files:
  Doc/library/sys.rst |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -425,7 +425,7 @@
    * On Mac OS X, the encoding is ``'utf-8'``.
 
    * On Unix, the encoding is the user's preference according to the result of
-     nl_langinfo(CODESET), or ``'utf-8'`` if ``nl_langinfo(CODESET)`` failed.
+     nl_langinfo(CODESET).
 
    * On Windows NT+, file names are Unicode natively, so no conversion is
      performed. :func:`getfilesystemencoding` still returns ``'mbcs'``, as
@@ -436,8 +436,7 @@
    * On Windows 9x, the encoding is ``'mbcs'``.
 
    .. versionchanged:: 3.2
-      On Unix, use ``'utf-8'`` instead of ``None`` if ``nl_langinfo(CODESET)``
-      failed. :func:`getfilesystemencoding` result cannot be ``None``.
+      :func:`getfilesystemencoding` result cannot be ``None`` anymore.
 
 
 .. function:: getrefcount(object)

-- 
Repository URL: http://hg.python.org/cpython