diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-08-29 22:21:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 22:21:32 +0200 |
| commit | 3d4226a832cabc630402589cc671cc4035d504e5 (patch) | |
| tree | a1c5b1c51cbbca3aedd52593c979a5c15d72dd52 /Programs | |
| parent | c5989cd87659acbfd4d19dc00dbe99c3a0fc9bd2 (diff) | |
| download | cpython-git-3d4226a832cabc630402589cc671cc4035d504e5.tar.gz | |
bpo-34523: Support surrogatepass in locale codecs (GH-8995)
Add support for the "surrogatepass" error handler in
PyUnicode_DecodeFSDefault() and PyUnicode_EncodeFSDefault()
for the UTF-8 encoding.
Changes:
* _Py_DecodeUTF8Ex() and _Py_EncodeUTF8Ex() now support the
surrogatepass error handler (_Py_ERROR_SURROGATEPASS).
* _Py_DecodeLocaleEx() and _Py_EncodeLocaleEx() now use
the _Py_error_handler enum instead of "int surrogateescape" to pass
the error handler. These functions now return -3 if the error
handler is unknown.
* Add unit tests on _Py_DecodeLocaleEx() and _Py_EncodeLocaleEx()
in test_codecs.
* Rename get_error_handler() to _Py_GetErrorHandler() and expose it
as a private function.
* _freeze_importlib doesn't need config.filesystem_errors="strict"
workaround anymore.
Diffstat (limited to 'Programs')
| -rw-r--r-- | Programs/_freeze_importlib.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c index 2621a7687e..8830d131d6 100644 --- a/Programs/_freeze_importlib.c +++ b/Programs/_freeze_importlib.c @@ -82,14 +82,6 @@ main(int argc, char *argv[]) /* Don't install importlib, since it could execute outdated bytecode. */ config._install_importlib = 0; config._frozen = 1; -#ifdef MS_WINDOWS - /* bpo-34523: initfsencoding() is not called if _install_importlib=0, - so interp->fscodec_initialized value remains 0. - PyUnicode_EncodeFSDefault() doesn't support the "surrogatepass" error - handler in such case, whereas it's the default error handler on Windows. - Force the "strict" error handler to work around this bootstrap issue. */ - config.filesystem_errors = "strict"; -#endif _PyInitError err = _Py_InitializeFromConfig(&config); /* No need to call _PyCoreConfig_Clear() since we didn't allocate any |