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.

Objects/object.c

diff --git a/Objects/object.c b/Objects/object.c
index 52acf12..aeaa4b5 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -295,9 +295,7 @@
             }
             else if (PyUnicode_Check(s)) {
                 PyObject *t;
-                t = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(s),
-                                         PyUnicode_GET_SIZE(s),
-                                         "backslashreplace");
+                t = PyUnicode_AsEncodedString(s, "utf-8", "backslashreplace");
                 if (t == NULL)
                     ret = 0;
                 else {
@@ -439,11 +437,7 @@
         return NULL;
 
     /* repr is guaranteed to be a PyUnicode object by PyObject_Repr */
-    ascii = PyUnicode_EncodeASCII(
-        PyUnicode_AS_UNICODE(repr),
-        PyUnicode_GET_SIZE(repr),
-        "backslashreplace");
-
+    ascii = _PyUnicode_AsASCIIString(repr, "backslashreplace");
     Py_DECREF(repr);
     if (ascii == NULL)
         return NULL;