summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-12-02 11:16:46 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-12-02 11:16:46 (GMT)
commit22d0418f71504c6501ec73e9d09f8b2bd9e8fdc1 (patch)
treeb9fc87c76ad4d9f9d97ff472f8ceedb69e9c4807 /Doc
parent9d1dbca5e2f6f75577ad4ea29514a4eabc38e913 (diff)
downloadcpython-22d0418f71504c6501ec73e9d09f8b2bd9e8fdc1.zip
cpython-22d0418f71504c6501ec73e9d09f8b2bd9e8fdc1.tar.gz
cpython-22d0418f71504c6501ec73e9d09f8b2bd9e8fdc1.tar.bz2
Issue #19728: Fix sys.getfilesystemencoding() documentation
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/sys.rst5
1 files changed, 2 insertions, 3 deletions
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 8ec1190..18d0527 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)