changeset: 87692:b231e0c3fd26 branch: 3.3 parent: 87690:7d3297f127ae user: Victor Stinner date: Mon Dec 02 12:16:46 2013 +0100 files: Doc/library/sys.rst description: Issue #19728: Fix sys.getfilesystemencoding() documentation diff -r 7d3297f127ae -r b231e0c3fd26 Doc/library/sys.rst --- a/Doc/library/sys.rst Mon Dec 02 11:41:01 2013 +0100 +++ b/Doc/library/sys.rst Mon Dec 02 12:16:46 2013 +0100 @@ -409,7 +409,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 @@ -420,8 +420,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)