From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 2 Oct 2011 17:00:15 +0000 (+0200)
Subject: PyCodec_ReplaceErrors() uses "C" format instead of "u#" to build result
X-Git-Tag: v3.3.0a1~1391
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a15aba71d45a6ad38ee535611aa7eaf23de2e3e;p=thirdparty%2FPython%2Fcpython.git

PyCodec_ReplaceErrors() uses "C" format instead of "u#" to build result
---

diff --git a/Python/codecs.c b/Python/codecs.c
index 4c2fc5d722fe..0008bdcbdca7 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -534,10 +534,11 @@ PyObject *PyCodec_ReplaceErrors(PyObject *exc)
         return Py_BuildValue("(Nn)", res, end);
     }
     else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) {
-        Py_UNICODE res = Py_UNICODE_REPLACEMENT_CHARACTER;
         if (PyUnicodeDecodeError_GetEnd(exc, &end))
             return NULL;
-        return Py_BuildValue("(u#n)", &res, 1, end);
+        return Py_BuildValue("(Cn)",
+                             (int)Py_UNICODE_REPLACEMENT_CHARACTER,
+                             end);
     }
     else if (PyObject_IsInstance(exc, PyExc_UnicodeTranslateError)) {
         PyObject *res;