Merged revisions 60379-60382 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60381 | christian.heimes | 2008-01-28 03:07:53 +0100 (Mon, 28 Jan 2008) | 1 line
static PyObject* variables should use PyString_InternFromString() instead of PyObject_FromString() to store a python string in a function level static var.
........
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 2a0376a..05f6a81 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1463,7 +1463,7 @@
}
if (round_str == NULL) {
- round_str = PyUnicode_FromString("__round__");
+ round_str = PyUnicode_InternFromString("__round__");
if (round_str == NULL)
return NULL;
}
@@ -1582,7 +1582,7 @@
}
if (trunc_str == NULL) {
- trunc_str = PyUnicode_FromString("__trunc__");
+ trunc_str = PyUnicode_InternFromString("__trunc__");
if (trunc_str == NULL)
return NULL;
}
diff --git a/Python/compile.c b/Python/compile.c
index 347a192..6ce465c 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1133,7 +1133,7 @@
int addNone = 1;
static PyObject *module;
if (!module) {
- module = PyUnicode_FromString("<module>");
+ module = PyUnicode_InternFromString("<module>");
if (!module)
return NULL;
}
@@ -1477,7 +1477,7 @@
/* initialize statics */
if (locals == NULL) {
- locals = PyUnicode_FromString("__locals__");
+ locals = PyUnicode_InternFromString("__locals__");
if (locals == NULL)
return 0;
}
@@ -2177,7 +2177,7 @@
if (Py_OptimizeFlag)
return 1;
if (assertion_error == NULL) {
- assertion_error = PyUnicode_FromString("AssertionError");
+ assertion_error = PyUnicode_InternFromString("AssertionError");
if (assertion_error == NULL)
return 0;
}