From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 2 Dec 2013 11:16:46 +0000 (+0100)
Subject: Issue #19728: Fix sys.getfilesystemencoding() documentation
X-Git-Tag: v3.4.0b2~403^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22d0418f71504c6501ec73e9d09f8b2bd9e8fdc1;p=thirdparty%2FPython%2Fcpython.git

Issue #19728: Fix sys.getfilesystemencoding() documentation
---

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 8ec119078add..18d05277ff9a 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -409,7 +409,7 @@ always available.
    * 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
@@ -420,8 +420,7 @@ always available.
    * 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)