diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-12-02 11:17:29 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-12-02 11:17:29 (GMT) |
| commit | 5f5657ee507be81749b0ade25fbe0a49d61716dd (patch) | |
| tree | e668c0b4bb48fd400ea004cb643142b4985a07e3 /Doc/library/sys.rst | |
| parent | 69359f6207db779a8db0433051da8098e7178f92 (diff) | |
| parent | 22d0418f71504c6501ec73e9d09f8b2bd9e8fdc1 (diff) | |
| download | cpython-5f5657ee507be81749b0ade25fbe0a49d61716dd.zip cpython-5f5657ee507be81749b0ade25fbe0a49d61716dd.tar.gz cpython-5f5657ee507be81749b0ade25fbe0a49d61716dd.tar.bz2 | |
(Merge 3.3) Issue #19728: Fix sys.getfilesystemencoding() documentation
Diffstat (limited to 'Doc/library/sys.rst')
| -rw-r--r-- | Doc/library/sys.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index f38640b..ad447a2 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -425,7 +425,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 @@ -436,8 +436,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) |