From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 7 Feb 2012 22:05:55 +0000 (+0100)
Subject: Backout d2c1521ad0a1: _Py_IDENTIFIER() uses UTF-8 again
X-Git-Tag: v3.3.0a1~230
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1cd99b533a32e063fc4602c439da334d5a10331;p=python

Backout d2c1521ad0a1: _Py_IDENTIFIER() uses UTF-8 again
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index f13a1de563..67336bf9f1 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1744,8 +1744,9 @@ PyObject *
 _PyUnicode_FromId(_Py_Identifier *id)
 {
     if (!id->object) {
-        id->object = unicode_fromascii((unsigned char*)id->string,
-                                       strlen(id->string));
+        id->object = PyUnicode_DecodeUTF8Stateful(id->string,
+                                                  strlen(id->string),
+                                                  NULL, NULL);
         if (!id->object)
             return NULL;
         PyUnicode_InternInPlace(&id->object);