diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-05-02 15:28:57 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 15:28:57 (GMT) |
| commit | e251095a3f4778102f554cecffcfd837f4d1db6c (patch) | |
| tree | 050ebaae241e689f989f42cf3d8bbe23d6f9258b /Objects | |
| parent | c4e78b116f9a4299f3b3bfbbd18ef49782bb1143 (diff) | |
| download | cpython-e251095a3f4778102f554cecffcfd837f4d1db6c.zip cpython-e251095a3f4778102f554cecffcfd837f4d1db6c.tar.gz cpython-e251095a3f4778102f554cecffcfd837f4d1db6c.tar.bz2 | |
bpo-36775: Add _Py_FORCE_UTF8_FS_ENCODING macro (GH-13056)
Add _Py_FORCE_UTF8_LOCALE and _Py_FORCE_UTF8_FS_ENCODING macros to
avoid factorize "#if defined(__ANDROID__) || defined(__VXWORKS__)"
and "#if defined(__APPLE__)".
Cleanup also config_init_fs_encoding().
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index f6e68c9..9991362 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3506,7 +3506,7 @@ PyUnicode_EncodeFSDefault(PyObject *unicode) { PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE(); const _PyCoreConfig *config = &interp->core_config; -#if defined(__APPLE__) +#ifdef _Py_FORCE_UTF8_FS_ENCODING return _PyUnicode_AsUTF8String(unicode, config->filesystem_errors); #else /* Bootstrap check: if the filesystem codec is implemented in Python, we @@ -3730,7 +3730,7 @@ PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size) { PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE(); const _PyCoreConfig *config = &interp->core_config; -#if defined(__APPLE__) +#ifdef _Py_FORCE_UTF8_FS_ENCODING return PyUnicode_DecodeUTF8Stateful(s, size, config->filesystem_errors, NULL); #else /* Bootstrap check: if the filesystem codec is implemented in Python, we |