mirror of
https://github.com/python/cpython.git
synced 2025-08-02 16:13:13 +00:00
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. ........
This commit is contained in:
parent
2685563583
commit
fe82e774ea
7 changed files with 20 additions and 19 deletions
|
@ -1463,7 +1463,7 @@ builtin_round(PyObject *self, PyObject *args, PyObject *kwds)
|
|||
}
|
||||
|
||||
if (round_str == NULL) {
|
||||
round_str = PyUnicode_FromString("__round__");
|
||||
round_str = PyUnicode_InternFromString("__round__");
|
||||
if (round_str == NULL)
|
||||
return NULL;
|
||||
}
|
||||
|
@ -1582,7 +1582,7 @@ builtin_trunc(PyObject *self, PyObject *number)
|
|||
}
|
||||
|
||||
if (trunc_str == NULL) {
|
||||
trunc_str = PyUnicode_FromString("__trunc__");
|
||||
trunc_str = PyUnicode_InternFromString("__trunc__");
|
||||
if (trunc_str == NULL)
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -1133,7 +1133,7 @@ compiler_mod(struct compiler *c, mod_ty mod)
|
|||
int addNone = 1;
|
||||
static PyObject *module;
|
||||
if (!module) {
|
||||
module = PyUnicode_FromString("<module>");
|
||||
module = PyUnicode_InternFromString("<module>");
|
||||
if (!module)
|
||||
return NULL;
|
||||
}
|
||||
|
@ -1477,7 +1477,7 @@ compiler_class(struct compiler *c, stmt_ty s)
|
|||
|
||||
/* initialize statics */
|
||||
if (locals == NULL) {
|
||||
locals = PyUnicode_FromString("__locals__");
|
||||
locals = PyUnicode_InternFromString("__locals__");
|
||||
if (locals == NULL)
|
||||
return 0;
|
||||
}
|
||||
|
@ -2177,7 +2177,7 @@ compiler_assert(struct compiler *c, stmt_ty s)
|
|||
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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue