mirror of
https://github.com/python/cpython.git
synced 2025-08-29 05:05:03 +00:00
Add PyUnicode_DecodeLocaleAndSize() and PyUnicode_DecodeLocale()
* PyUnicode_DecodeLocaleAndSize() and PyUnicode_DecodeLocale() decode a string from the current locale encoding * _Py_char2wchar() writes an "error code" in the size argument to indicate if the function failed because of memory allocation failure or because of a decoding error. The function doesn't write the error message directly to stderr. * Fix time.strftime() (if wcsftime() is missing): decode strftime() result from the current locale encoding, not from the filesystem encoding.
This commit is contained in:
parent
3607e3de27
commit
af02e1c85a
7 changed files with 174 additions and 84 deletions
|
@ -1595,6 +1595,28 @@ PyAPI_FUNC(PyObject*) _PyUnicode_TransformDecimalAndSpaceToASCII(
|
|||
);
|
||||
#endif
|
||||
|
||||
/* --- Locale encoding --------------------------------------------------- */
|
||||
|
||||
/* Decode a string from the current locale encoding. The decoder is strict if
|
||||
*surrogateescape* is equal to zero, otherwise it uses the 'surrogateescape'
|
||||
error handler (PEP 383) to escape undecodable bytes. If a byte sequence can
|
||||
be decoded as a surrogate character and *surrogateescape* is not equal to
|
||||
zero, the byte sequence is escaped using the 'surrogateescape' error handler
|
||||
instead of being decoded. *str* must end with a null character but cannot
|
||||
contain embedded null character. */
|
||||
|
||||
PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocaleAndSize(
|
||||
const char *str,
|
||||
Py_ssize_t len,
|
||||
int surrogateescape);
|
||||
|
||||
/* Similar to PyUnicode_DecodeLocaleAndSize(), but compute the string
|
||||
length using strlen(). */
|
||||
|
||||
PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocale(
|
||||
const char *str,
|
||||
int surrogateescape);
|
||||
|
||||
/* --- File system encoding ---------------------------------------------- */
|
||||
|
||||
/* ParseTuple converter: encode str objects to bytes using
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue