diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-15 12:04:23 +0000 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-15 12:04:23 +0000 |
| commit | a47a00d4de1dba7e27eb086e9843d0e1592663ef (patch) | |
| tree | 37168e66ffd361e7028543812b26de7e7da46017 /Include | |
| parent | 9add3cda9de8882b78ac036ab30a3ed068ec1a73 (diff) | |
| download | cpython-a47a00d4de1dba7e27eb086e9843d0e1592663ef.tar.gz | |
Use locale encoding if Py_FileSystemDefaultEncoding is not set
* PyUnicode_EncodeFSDefault(), PyUnicode_DecodeFSDefaultAndSize() and
PyUnicode_DecodeFSDefault() use the locale encoding instead of UTF-8 if
Py_FileSystemDefaultEncoding is NULL
* redecode_filenames() functions and _Py_code_object_list (issue #9630)
are no more needed: remove them
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/code.h | 9 | ||||
| -rw-r--r-- | Include/unicodeobject.h | 9 |
2 files changed, 7 insertions, 11 deletions
diff --git a/Include/code.h b/Include/code.h index bdbfaba28c..11ecc9562c 100644 --- a/Include/code.h +++ b/Include/code.h @@ -72,7 +72,7 @@ PyAPI_DATA(PyTypeObject) PyCode_Type; PyAPI_FUNC(PyCodeObject *) PyCode_New( int, int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *, PyObject *, PyObject *, - PyObject *, PyObject *, int, PyObject *); + PyObject *, PyObject *, int, PyObject *); /* same as struct above */ /* Creates a new empty code object with the specified source location. */ @@ -99,13 +99,6 @@ PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co, PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, PyObject *lineno_obj); -/* List of weak references to all code objects. The list is used by - initfsencoding() to redecode code filenames at startup if the filesystem - encoding changes. At initfsencoding() exit, the list is set to NULL and it - is no more used. */ - -extern PyObject *_Py_code_object_list; - #ifdef __cplusplus } #endif diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 39a6b2ef65..f61712bdbc 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1193,7 +1193,8 @@ PyAPI_FUNC(int) PyUnicode_FSDecoder(PyObject*, void*); /* Decode a null-terminated string using Py_FileSystemDefaultEncoding and the "surrogateescape" error handler. - If Py_FileSystemDefaultEncoding is not set, fall back to UTF-8. + If Py_FileSystemDefaultEncoding is not set, fall back to the locale + encoding. Use PyUnicode_DecodeFSDefaultAndSize() if the string length is known. */ @@ -1205,7 +1206,8 @@ PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefault( /* Decode a string using Py_FileSystemDefaultEncoding and the "surrogateescape" error handler. - If Py_FileSystemDefaultEncoding is not set, fall back to UTF-8. + If Py_FileSystemDefaultEncoding is not set, fall back to the locale + encoding. */ PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize( @@ -1216,7 +1218,8 @@ PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize( /* Encode a Unicode object to Py_FileSystemDefaultEncoding with the "surrogateescape" error handler, and return bytes. - If Py_FileSystemDefaultEncoding is not set, fall back to UTF-8. + If Py_FileSystemDefaultEncoding is not set, fall back to the locale + encoding. */ PyAPI_FUNC(PyObject*) PyUnicode_EncodeFSDefault( |