mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 81168 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81168 | victor.stinner | 2010-05-14 17:58:55 +0200 (ven., 14 mai 2010) | 10 lines

  Issue #8711: Document PyUnicode_DecodeFSDefault*() functions

   * Add paragraph titles to c-api/unicode.rst.
   * Fix PyUnicode_DecodeFSDefault*() comment: it now uses the "surrogateescape"
     error handler (and not "replace")
   * Remove "The function is intended to be used for paths and file names only
     during bootstrapping process where the codecs are not set up." from
     PyUnicode_FSConverter() comment: it is used after the bootstrapping and for
     other purposes than file names
........
This commit is contained in:
Victor Stinner 2010-05-14 16:08:46 +00:00
parent 9d765bd0ea
commit 9076f9e187
2 changed files with 101 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Include/unicodeobject.h
View file

@ -1238,25 +1238,29 @@ PyAPI_FUNC(int) PyUnicode_EncodeDecimal(
/* --- File system encoding ---------------------------------------------- */
/* ParseTuple converter which converts a Unicode object into the file
system encoding, using the PEP 383 error handler; bytes objects are
output as-is. */
system encoding as a bytes object, using the "surrogateescape" error
handler; bytes objects are output as-is. */
PyAPI_FUNC(int) PyUnicode_FSConverter(PyObject*, void*);
/* Decode a null-terminated string using Py_FileSystemDefaultEncoding.
/* Decode a null-terminated string using Py_FileSystemDefaultEncoding
and the "surrogateescape" error handler.
If the encoding is supported by one of the built-in codecs (i.e., UTF-8,
UTF-16, UTF-32, Latin-1 or MBCS), otherwise fallback to UTF-8 and replace
invalid characters with '?'.
If Py_FileSystemDefaultEncoding is not set, fall back to UTF-8.
The function is intended to be used for paths and file names only
during bootstrapping process where the codecs are not set up.
Use PyUnicode_DecodeFSDefaultAndSize() if you have the string length.
*/
PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefault(
const char *s /* encoded string */
);
/* Decode a string using Py_FileSystemDefaultEncoding
and the "surrogateescape" error handler.
If Py_FileSystemDefaultEncoding is not set, fall back to UTF-8.
*/
PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize(
const char *s, /* encoded string */
Py_ssize_t size /* size */