mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Document that the 'strict' error handler is used to encode/decode filenames on

Browse source 
Windows
This commit is contained in:
Victor Stinner 2010-10-09 10:34:37 +00:00
parent 257d38ffdd
commit 62165d67a2
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Doc/c-api/unicode.rst
View file

@ -412,26 +412,33 @@ used, passing :c:func:`PyUnicode_FSDecoder` as the conversion function:
.. c:function:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size) .. c:function:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
Decode a string using :c:data:`Py_FileSystemDefaultEncoding` and the
``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to UTF-8.
.. versionchanged:: 3.2
Use ``'strict'`` error handler on Windows.
.. c:function:: PyObject* PyUnicode_DecodeFSDefault(const char *s)
Decode a null-terminated string using :c:data:`Py_FileSystemDefaultEncoding` Decode a null-terminated string using :c:data:`Py_FileSystemDefaultEncoding`
and the ``"surrogateescape"`` error handler. and the ``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to UTF-8. If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to UTF-8.
Use :c:func:`PyUnicode_DecodeFSDefaultAndSize` if you know the string length. Use :c:func:`PyUnicode_DecodeFSDefaultAndSize` if you know the string length.
.. versionchanged:: 3.2
.. c:function:: PyObject* PyUnicode_DecodeFSDefault(const char *s) Use ``'strict'`` error handler on Windows.
Decode a string using :c:data:`Py_FileSystemDefaultEncoding` and
the ``"surrogateescape"`` error handler.
If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to UTF-8.
.. c:function:: PyObject* PyUnicode_EncodeFSDefault(PyObject *unicode) .. c:function:: PyObject* PyUnicode_EncodeFSDefault(PyObject *unicode)
Encode a Unicode object to :c:data:`Py_FileSystemDefaultEncoding` with the Encode a Unicode object to :c:data:`Py_FileSystemDefaultEncoding` with the
``'surrogateescape'`` error handler, and return :class:`bytes`. ``'surrogateescape'`` error handler, or ``'strict'`` on Windows, and return
:class:`bytes`.
If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to UTF-8. If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to UTF-8.

8
Doc/library/os.rst
View file

@ -158,9 +158,7 @@ process and user.
.. function:: fsencode(filename) .. function:: fsencode(filename)
Encode *filename* to the filesystem encoding with ``'surrogateescape'`` Encode *filename* to the filesystem encoding with ``'surrogateescape'``
error handler, return :class:`bytes` unchanged. On Windows, use ``'strict'`` error handler, or ``'strict'`` on Windows; return :class:`bytes` unchanged.
error handler if the filesystem encoding is ``'mbcs'`` (which is the default
encoding).
:func:`fsdecode` is the reverse function. :func:`fsdecode` is the reverse function.
@ -170,9 +168,7 @@ process and user.
.. function:: fsdecode(filename) .. function:: fsdecode(filename)
Decode *filename* from the filesystem encoding with ``'surrogateescape'`` Decode *filename* from the filesystem encoding with ``'surrogateescape'``
error handler, return :class:`str` unchanged. On Windows, use ``'strict'`` error handler, or ``'strict'`` on Windows; return :class:`str` unchanged.
error handler if the filesystem encoding is ``'mbcs'`` (which is the default
encoding).
:func:`fsencode` is the reverse function. :func:`fsencode` is the reverse function.