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

Issue #9642: Uniformize the tests on the availability of the mbcs codec

Browse source 
Add a new HAVE_MBCS define.
This commit is contained in:
Victor Stinner 2011-07-04 14:23:54 +02:00
parent 9122fdd8fa
commit 99b9538636
6 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Objects/unicodeobject.c
View file

@ -1506,7 +1506,7 @@ PyUnicode_Decode(const char *s,
(strcmp(lower, "latin1") == 0) ||
(strcmp(lower, "iso-8859-1") == 0))
return PyUnicode_DecodeLatin1(s, size, errors);
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
#ifdef HAVE_MBCS
else if (strcmp(lower, "mbcs") == 0)
return PyUnicode_DecodeMBCS(s, size, errors);
#endif
@ -1644,7 +1644,7 @@ PyUnicode_AsEncodedObject(PyObject *unicode,
PyObject *
PyUnicode_EncodeFSDefault(PyObject *unicode)
{
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
#ifdef HAVE_MBCS
return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(unicode),
PyUnicode_GET_SIZE(unicode),
NULL);
@ -1746,7 +1746,7 @@ PyUnicode_AsEncodedString(PyObject *unicode,
return PyUnicode_EncodeLatin1(PyUnicode_AS_UNICODE(unicode),
PyUnicode_GET_SIZE(unicode),
errors);
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
#ifdef HAVE_MBCS
else if (strcmp(lower, "mbcs") == 0)
return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(unicode),
PyUnicode_GET_SIZE(unicode),
@ -1848,7 +1848,7 @@ PyUnicode_DecodeFSDefault(const char *s) {
PyObject*
PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
{
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
#ifdef HAVE_MBCS
return PyUnicode_DecodeMBCS(s, size, NULL);
#elif defined(__APPLE__)
return PyUnicode_DecodeUTF8(s, size, "surrogateescape");
@ -4942,7 +4942,7 @@ PyUnicode_AsASCIIString(PyObject *unicode)
NULL);
}
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
#ifdef HAVE_MBCS
/* --- MBCS codecs for Windows -------------------------------------------- */
@ -5229,7 +5229,7 @@ PyUnicode_AsMBCSString(PyObject *unicode)
#undef NEED_RETRY
#endif /* MS_WINDOWS */
#endif /* HAVE_MBCS */
/* --- Character Mapping Codec -------------------------------------------- */