mirror of
https://github.com/python/cpython.git
synced 2025-07-09 20:35:26 +00:00
Revert 55876. Use PyUnicode_AsEncodedString instead.
This commit is contained in:
parent
543c09e700
commit
427dbff8f0
2 changed files with 3 additions and 20 deletions
|
@ -319,23 +319,6 @@ PyObject *PyCodec_Encode(PyObject *object,
|
|||
PyObject *args = NULL, *result = NULL;
|
||||
PyObject *v;
|
||||
|
||||
/* XXX short-cut a few common file system
|
||||
encodings for now, as otherwise the import
|
||||
code can't load the codec registry. */
|
||||
if (strcmp(encoding, "utf-8") == 0 && PyUnicode_Check(object)) {
|
||||
return PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(object),
|
||||
PyUnicode_GET_SIZE(object),
|
||||
errors);
|
||||
}
|
||||
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
|
||||
if (strcmp(encoding, "mbcs") == 0 && PyUnicode_Check(object)) {
|
||||
return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(object),
|
||||
PyUnicode_GET_SIZE(object),
|
||||
errors);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
encoder = PyCodec_Encoder(encoding);
|
||||
if (encoder == NULL)
|
||||
goto onError;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue