mirror of
https://github.com/python/cpython.git
synced 2024-12-15 12:54:31 +08:00
Remove bootstrap code of PyUnicode_AsEncodedString()
Issue #11187: Remove bootstrap code (use ASCII) of PyUnicode_AsEncodedString(), it was replaced by a better fallback (use the locale encoding) in PyUnicode_EncodeFSDefault(). Prepare also empty sections in NEWS.
This commit is contained in:
parent
5eaee2e23b
commit
fd34b3788f
@ -12,11 +12,15 @@ Core and Builtins
|
|||||||
|
|
||||||
- Check for NULL result in PyType_FromSpec.
|
- Check for NULL result in PyType_FromSpec.
|
||||||
|
|
||||||
|
- Issue #11187: Remove bootstrap code (use ASCII) of
|
||||||
|
PyUnicode_AsEncodedString(), it was replaced by a better fallback (use the
|
||||||
|
locale encoding) in PyUnicode_EncodeFSDefault().
|
||||||
|
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
- Issue #11089: Fix performance issue limiting the use of ConfigParser()
|
- Issue #11089: Fix performance issue limiting the use of ConfigParser()
|
||||||
with large config files.
|
with large config files.
|
||||||
|
|
||||||
- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
|
- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
|
||||||
larger than 4GB. Patch by Nadeem Vawda.
|
larger than 4GB. Patch by Nadeem Vawda.
|
||||||
|
@ -1673,21 +1673,6 @@ PyObject *PyUnicode_AsEncodedString(PyObject *unicode,
|
|||||||
PyUnicode_GET_SIZE(unicode),
|
PyUnicode_GET_SIZE(unicode),
|
||||||
errors);
|
errors);
|
||||||
}
|
}
|
||||||
/* During bootstrap, we may need to find the encodings
|
|
||||||
package, to load the file system encoding, and require the
|
|
||||||
file system encoding in order to load the encodings
|
|
||||||
package.
|
|
||||||
|
|
||||||
Break out of this dependency by assuming that the path to
|
|
||||||
the encodings module is ASCII-only. XXX could try wcstombs
|
|
||||||
instead, if the file system encoding is the locale's
|
|
||||||
encoding. */
|
|
||||||
if (Py_FileSystemDefaultEncoding &&
|
|
||||||
strcmp(encoding, Py_FileSystemDefaultEncoding) == 0 &&
|
|
||||||
!PyThreadState_GET()->interp->codecs_initialized)
|
|
||||||
return PyUnicode_EncodeASCII(PyUnicode_AS_UNICODE(unicode),
|
|
||||||
PyUnicode_GET_SIZE(unicode),
|
|
||||||
errors);
|
|
||||||
|
|
||||||
/* Encode via the codec registry */
|
/* Encode via the codec registry */
|
||||||
v = PyCodec_Encode(unicode, encoding, errors);
|
v = PyCodec_Encode(unicode, encoding, errors);
|
||||||
|
Loading…
Reference in New Issue
Block a user