mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Simplify PyUnicode_Encode/DecodeFSDefault on Windows/Mac OS X

Browse source 
* Windows always uses mbcs
 * Mac OS X always uses utf-8
This commit is contained in:
Victor Stinner 2010-10-27 00:25:46 +00:00
parent 91b47c64e1
commit ad15872854
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Objects/unicodeobject.c
View file

@ -1584,15 +1584,19 @@ PyObject *PyUnicode_AsEncodedObject(PyObject *unicode,
return NULL; return NULL;
} }
PyObject *PyUnicode_EncodeFSDefault(PyObject *unicode) PyObject *
PyUnicode_EncodeFSDefault(PyObject *unicode)
{ {
if (Py_FileSystemDefaultEncoding) {
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
if (strcmp(Py_FileSystemDefaultEncoding, "mbcs") == 0) return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(unicode),
return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(unicode), PyUnicode_GET_SIZE(unicode),
PyUnicode_GET_SIZE(unicode), NULL);
NULL); #elif defined(__APPLE__)
#endif return PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(unicode),
PyUnicode_GET_SIZE(unicode),
"surrogateescape");
#else
if (Py_FileSystemDefaultEncoding) {
return PyUnicode_AsEncodedString(unicode, return PyUnicode_AsEncodedString(unicode,
Py_FileSystemDefaultEncoding, Py_FileSystemDefaultEncoding,
"surrogateescape"); "surrogateescape");
@ -1615,6 +1619,7 @@ PyObject *PyUnicode_EncodeFSDefault(PyObject *unicode)
PyMem_Free(bytes); PyMem_Free(bytes);
return bytes_obj; return bytes_obj;
} }
#endif
} }
PyObject *PyUnicode_AsEncodedString(PyObject *unicode, PyObject *PyUnicode_AsEncodedString(PyObject *unicode,
@ -1761,21 +1766,17 @@ PyUnicode_DecodeFSDefault(const char *s) {
PyObject* PyObject*
PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size) PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
{ {
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
return PyUnicode_DecodeMBCS(s, size, NULL);
#elif defined(__APPLE__)
return PyUnicode_DecodeUTF8(s, size, "surrogateescape");
#else
/* During the early bootstrapping process, Py_FileSystemDefaultEncoding /* During the early bootstrapping process, Py_FileSystemDefaultEncoding
can be undefined. If it is case, decode using UTF-8. The following assumes can be undefined. If it is case, decode using UTF-8. The following assumes
that Py_FileSystemDefaultEncoding is set to a built-in encoding during the that Py_FileSystemDefaultEncoding is set to a built-in encoding during the
bootstrapping process where the codecs aren't ready yet. bootstrapping process where the codecs aren't ready yet.
*/ */
if (Py_FileSystemDefaultEncoding) { if (Py_FileSystemDefaultEncoding) {
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
if (strcmp(Py_FileSystemDefaultEncoding, "mbcs") == 0) {
return PyUnicode_DecodeMBCS(s, size, NULL);
}
#elif defined(__APPLE__)
if (strcmp(Py_FileSystemDefaultEncoding, "utf-8") == 0) {
return PyUnicode_DecodeUTF8(s, size, "surrogateescape");
}
#endif
return PyUnicode_Decode(s, size, return PyUnicode_Decode(s, size,
Py_FileSystemDefaultEncoding, Py_FileSystemDefaultEncoding,
"surrogateescape"); "surrogateescape");
@ -1799,6 +1800,7 @@ PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
PyMem_Free(wchar); PyMem_Free(wchar);
return unicode; return unicode;
} }
#endif
} }