commit d63a3b8beb4a0841cb59fb3515347ccaab34b733
author Martin v. Löwis <martin@v.loewis.de> Wed Sep 28 07:41:54 2011 +0200
committer Martin v. Löwis <martin@v.loewis.de> Wed Sep 28 07:41:54 2011 +0200
tree 3b4e3cc63151c5a5a910c3550a190aefaea96ad4
parent 48d49497c50e79d14e9df9527d766ca3a0a38be5

Implement PEP 393.

Modules/_codecsmodule.c

diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
index 4bc0482..c9843c2 100644
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@ -700,12 +700,10 @@
         return NULL;
 
     str = PyUnicode_FromObject(str);
-    if (str == NULL)
+    if (str == NULL || PyUnicode_READY(str) == -1)
         return NULL;
-    v = codec_tuple(PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(str),
-                                         PyUnicode_GET_SIZE(str),
-                                         errors),
-                    PyUnicode_GET_SIZE(str));
+    v = codec_tuple(PyUnicode_AsEncodedString(str, "utf-8", errors),
+                    PyUnicode_GET_LENGTH(str));
     Py_DECREF(str);
     return v;
 }