]> granicus.if.org Git - python/commitdiff
Backout d2c1521ad0a1: _Py_IDENTIFIER() uses UTF-8 again
authorVictor Stinner <victor.stinner@haypocalc.com>
Tue, 7 Feb 2012 22:05:55 +0000 (23:05 +0100)
committerVictor Stinner <victor.stinner@haypocalc.com>
Tue, 7 Feb 2012 22:05:55 +0000 (23:05 +0100)
Objects/unicodeobject.c

index f13a1de563aa2b82a1c70597ae4d7f48425b89b7..67336bf9f19b7201749c866f041f11ac7ad253cd 100644 (file)
@@ -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);