summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2020-11-01 19:59:35 (GMT)
committerGitHub <noreply@github.com>2020-11-01 19:59:35 (GMT)
commit82458b6cdbae3b849dc11d0d7dc2ab06ef0451c4 (patch)
treef70b3003306fdc3165740eec39eadec9a2e82a9c /Include
parent1f7dfb277e5b88cddc13e5024766be787a3e9127 (diff)
downloadcpython-82458b6cdbae3b849dc11d0d7dc2ab06ef0451c4.zip
cpython-82458b6cdbae3b849dc11d0d7dc2ab06ef0451c4.tar.gz
cpython-82458b6cdbae3b849dc11d0d7dc2ab06ef0451c4.tar.bz2
bpo-42236: Enhance _locale._get_locale_encoding() (GH-23083)
* Rename _Py_GetLocaleEncoding() to _Py_GetLocaleEncodingObject() * Add _Py_GetLocaleEncoding() which returns a wchar_t* string to share code between _Py_GetLocaleEncodingObject() and config_get_locale_encoding(). * _Py_GetLocaleEncodingObject() now decodes nl_langinfo(CODESET) from the current locale encoding with surrogateescape, rather than using UTF-8.
Diffstat (limited to 'Include')
-rw-r--r--Include/internal/pycore_fileutils.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Include/internal/pycore_fileutils.h b/Include/internal/pycore_fileutils.h
index ff7bc48..1ab554f 100644
--- a/Include/internal/pycore_fileutils.h
+++ b/Include/internal/pycore_fileutils.h
@@ -50,7 +50,8 @@ PyAPI_FUNC(int) _Py_GetLocaleconvNumeric(
PyAPI_FUNC(void) _Py_closerange(int first, int last);
-PyAPI_FUNC(PyObject*) _Py_GetLocaleEncoding(void);
+PyAPI_FUNC(wchar_t*) _Py_GetLocaleEncoding(const char **errmsg);
+PyAPI_FUNC(PyObject*) _Py_GetLocaleEncodingObject(void);
#ifdef __cplusplus
}