From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 7 Mar 2011 17:28:15 +0000 (+0100)
Subject: Issue #3080: Use PyUnicode_InternFromString() for builtins
X-Git-Tag: v3.3.0a1~2874
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21fcd0c9aff01d69e1e92c1587e59638ff58a690;p=thirdparty%2FPython%2Fcpython.git

Issue #3080: Use PyUnicode_InternFromString() for builtins

_PyImport_FixupBuiltin() and _PyImport_FindBuiltin() use
PyUnicode_InternFromString() instead of PyUnicode_FromString().
---

diff --git a/Python/import.c b/Python/import.c
index 597ef439c3ee..d43b881c2f4d 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -625,7 +625,7 @@ _PyImport_FixupBuiltin(PyObject *mod, char *name)
 {
     int res;
     PyObject *nameobj;
-    nameobj = PyUnicode_FromString(name);
+    nameobj = PyUnicode_InternFromString(name);
     if (nameobj == NULL)
         return -1;
     res = _PyImport_FixupExtensionObject(mod, nameobj, nameobj);
@@ -681,7 +681,7 @@ PyObject *
 _PyImport_FindBuiltin(const char *name)
 {
     PyObject *res, *nameobj;
-    nameobj = PyUnicode_FromString(name);
+    nameobj = PyUnicode_InternFromString(name);
     if (nameobj == NULL)
         return NULL;
     res = _PyImport_FindExtensionObject(nameobj, nameobj);