From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 1 Dec 2011 01:52:11 +0000 (+0100)
Subject: PyCodec_IgnoreErrors() avoids the deprecated "u#" format
X-Git-Tag: v3.3.0a1~705
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee450093a9cebf99f186f69a14c7c36ff23b5b00;p=thirdparty%2FPython%2Fcpython.git

PyCodec_IgnoreErrors() avoids the deprecated "u#" format
---

diff --git a/Python/codecs.c b/Python/codecs.c
index cdf2c4455a3f..9b0c4b2f446b 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -510,8 +510,7 @@ PyObject *PyCodec_IgnoreErrors(PyObject *exc)
         wrong_exception_type(exc);
         return NULL;
     }
-    /* ouch: passing NULL, 0, pos gives None instead of u'' */
-    return Py_BuildValue("(u#n)", &end, 0, end);
+    return Py_BuildValue("(Nn)", PyUnicode_New(0, 0), end);
 }