bpo-29240: PyUnicode_DecodeLocale() uses UTF-8 on Android (#5272)
PyUnicode_DecodeLocaleAndSize(), PyUnicode_DecodeLocale() and
PyUnicode_EncodeLocale() now use always use the UTF-8 encoding on
Android, instead of the current locale encoding.
On Android API 19, mbstowcs() and wcstombs() are broken and cannot be
used.
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index 3f6c055..92e22b1 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -760,7 +760,8 @@
Py_ssize_t len, \
const char *errors)
- Decode a string from the current locale encoding. The supported
+ Decode a string from UTF-8 on Android, or from the current locale encoding
+ on other platforms. The supported
error handlers are ``"strict"`` and ``"surrogateescape"``
(:pep:`383`). The decoder uses ``"strict"`` error handler if
*errors* is ``NULL``. *str* must end with a null character but
@@ -780,7 +781,7 @@
.. versionchanged:: 3.7
The function now also uses the current locale encoding for the
- ``surrogateescape`` error handler. Previously, :c:func:`Py_DecodeLocale`
+ ``surrogateescape`` error handler, except on Android. Previously, :c:func:`Py_DecodeLocale`
was used for the ``surrogateescape``, and the current locale encoding was
used for ``strict``.
@@ -795,7 +796,8 @@
.. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, const char *errors)
- Encode a Unicode object to the current locale encoding. The
+ Encode a Unicode object to UTF-8 on Android, or to the current locale
+ encoding on other platforms. The
supported error handlers are ``"strict"`` and ``"surrogateescape"``
(:pep:`383`). The encoder uses ``"strict"`` error handler if
*errors* is ``NULL``. Return a :class:`bytes` object. *unicode* cannot
@@ -815,7 +817,8 @@
.. versionchanged:: 3.7
The function now also uses the current locale encoding for the
- ``surrogateescape`` error handler. Previously, :c:func:`Py_EncodeLocale`
+ ``surrogateescape`` error handler, except on Android. Previously,
+ :c:func:`Py_EncodeLocale`
was used for the ``surrogateescape``, and the current locale encoding was
used for ``strict``.
diff --git a/Python/fileutils.c b/Python/fileutils.c
index 9a1435c..d610639 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -449,7 +449,12 @@
int current_locale, int surrogateescape)
{
if (current_locale) {
+#ifdef __ANDROID__
+ return _Py_DecodeUTF8Ex(arg, strlen(arg), wstr, wlen, reason,
+ surrogateescape);
+#else
return decode_current_locale(arg, wstr, wlen, reason, surrogateescape);
+#endif
}
#if defined(__APPLE__) || defined(__ANDROID__)
@@ -605,8 +610,13 @@
int raw_malloc, int current_locale, int surrogateescape)
{
if (current_locale) {
+#ifdef __ANDROID__
+ return _Py_EncodeUTF8Ex(text, str, error_pos, reason,
+ raw_malloc, surrogateescape);
+#else
return encode_current_locale(text, str, error_pos, reason,
raw_malloc, surrogateescape);
+#endif
}
#if defined(__APPLE__) || defined(__ANDROID__)