diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-06-12 05:53:00 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-06-12 05:53:00 (GMT) |
| commit | 427dbff8f04a3a34703bf8a1faec77ad334f1d01 (patch) | |
| tree | 2b0d4f1b998364fcca10f1cd5f064c7c81cbd624 /Python/codecs.c | |
| parent | 543c09e7004173a7504b004fc1c4bba695b3be5f (diff) | |
| download | cpython-427dbff8f04a3a34703bf8a1faec77ad334f1d01.zip cpython-427dbff8f04a3a34703bf8a1faec77ad334f1d01.tar.gz cpython-427dbff8f04a3a34703bf8a1faec77ad334f1d01.tar.bz2 | |
Revert 55876. Use PyUnicode_AsEncodedString instead.
Diffstat (limited to 'Python/codecs.c')
| -rw-r--r-- | Python/codecs.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index 1ba6009..3aa1f38 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -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; |