mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 60379-60382 via svnmerge from

Browse source 
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:
Christian Heimes 2008-01-28 02:38:20 +00:00
parent 2685563583
commit fe82e774ea
7 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/_ctypes/_ctypes.c
View file

@ -1530,9 +1530,9 @@ static PyObject *CreateSwappedType(PyTypeObject *type, PyObject *args, PyObject
if (suffix == NULL) if (suffix == NULL)
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
suffix = PyUnicode_FromString("_le"); suffix = PyUnicode_InternFromString("_le");
#else #else
suffix = PyUnicode_FromString("_be"); suffix = PyUnicode_InternFromString("_be");
#endif #endif
newname = PyUnicode_Concat(name, suffix); newname = PyUnicode_Concat(name, suffix);
@ -4276,7 +4276,7 @@ Simple_repr(CDataObject *self)
} }
if (format == NULL) { if (format == NULL) {
format = PyUnicode_FromString("%s(%r)"); format = PyUnicode_InternFromString("%s(%r)");
if (format == NULL) if (format == NULL)
return NULL; return NULL;
} }

4
Modules/_ctypes/callbacks.c
View file

@ -365,7 +365,7 @@ long Call_GetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
static PyObject *context; static PyObject *context;
if (context == NULL) if (context == NULL)
context = PyUnicode_FromString("_ctypes.DllGetClassObject"); context = PyUnicode_InternFromString("_ctypes.DllGetClassObject");
mod = PyImport_ImportModuleNoBlock("ctypes"); mod = PyImport_ImportModuleNoBlock("ctypes");
if (!mod) { if (!mod) {
@ -444,7 +444,7 @@ long Call_CanUnloadNow(void)
static PyObject *context; static PyObject *context;
if (context == NULL) if (context == NULL)
context = PyUnicode_FromString("_ctypes.DllCanUnloadNow"); context = PyUnicode_InternFromString("_ctypes.DllCanUnloadNow");
mod = PyImport_ImportModuleNoBlock("ctypes"); mod = PyImport_ImportModuleNoBlock("ctypes");
if (!mod) { if (!mod) {

4
Modules/mathmodule.c
View file

@ -131,7 +131,7 @@ static PyObject * math_ceil(PyObject *self, PyObject *number) {
PyObject *method; PyObject *method;
if (ceil_str == NULL) { if (ceil_str == NULL) {
ceil_str = PyUnicode_FromString("__ceil__"); ceil_str = PyUnicode_InternFromString("__ceil__");
if (ceil_str == NULL) if (ceil_str == NULL)
return NULL; return NULL;
} }
@ -171,7 +171,7 @@ static PyObject * math_floor(PyObject *self, PyObject *number) {
PyObject *method; PyObject *method;
if (floor_str == NULL) { if (floor_str == NULL) {
floor_str = PyUnicode_FromString("__floor__"); floor_str = PyUnicode_InternFromString("__floor__");
if (floor_str == NULL) if (floor_str == NULL)
return NULL; return NULL;
} }

4
Objects/abstract.c
View file

@ -2333,7 +2333,7 @@ abstract_get_bases(PyObject *cls)
PyObject *bases; PyObject *bases;
if (__bases__ == NULL) { if (__bases__ == NULL) {
__bases__ = PyUnicode_FromString("__bases__"); __bases__ = PyUnicode_InternFromString("__bases__");
if (__bases__ == NULL) if (__bases__ == NULL)
return NULL; return NULL;
} }
@ -2413,7 +2413,7 @@ recursive_isinstance(PyObject *inst, PyObject *cls, int recursion_depth)
int retval = 0; int retval = 0;
if (__class__ == NULL) { if (__class__ == NULL) {
__class__ = PyUnicode_FromString("__class__"); __class__ = PyUnicode_InternFromString("__class__");
if (__class__ == NULL) if (__class__ == NULL)
return -1; return -1;
} }

11
Objects/complexobject.c
View file

@ -265,13 +265,14 @@ PyComplex_AsCComplex(PyObject *op)
/* return -1 on failure */ /* return -1 on failure */
cv.real = -1.; cv.real = -1.;
cv.imag = 0.; cv.imag = 0.;
if (complex_str == NULL) {
if (!(complex_str = PyUnicode_FromString("__complex__")))
return cv;
}
{ {
PyObject *complexfunc; PyObject *complexfunc;
if (!complex_str) {
if (!(complex_str = PyUnicode_FromString("__complex__")))
return cv;
}
complexfunc = _PyType_Lookup(op->ob_type, complex_str); complexfunc = _PyType_Lookup(op->ob_type, complex_str);
/* complexfunc is a borrowed reference */ /* complexfunc is a borrowed reference */
if (complexfunc) { if (complexfunc) {

4
Python/bltinmodule.c
View file

@ -1463,7 +1463,7 @@ builtin_round(PyObject *self, PyObject *args, PyObject *kwds)
} }
if (round_str == NULL) { if (round_str == NULL) {
round_str = PyUnicode_FromString("__round__"); round_str = PyUnicode_InternFromString("__round__");
if (round_str == NULL) if (round_str == NULL)
return NULL; return NULL;
} }
@ -1582,7 +1582,7 @@ builtin_trunc(PyObject *self, PyObject *number)
} }
if (trunc_str == NULL) { if (trunc_str == NULL) {
trunc_str = PyUnicode_FromString("__trunc__"); trunc_str = PyUnicode_InternFromString("__trunc__");
if (trunc_str == NULL) if (trunc_str == NULL)
return NULL; return NULL;
} }

6
Python/compile.c
View file

@ -1133,7 +1133,7 @@ compiler_mod(struct compiler *c, mod_ty mod)
int addNone = 1; int addNone = 1;
static PyObject *module; static PyObject *module;
if (!module) { if (!module) {
module = PyUnicode_FromString("<module>"); module = PyUnicode_InternFromString("<module>");
if (!module) if (!module)
return NULL; return NULL;
} }
@ -1477,7 +1477,7 @@ compiler_class(struct compiler *c, stmt_ty s)
/* initialize statics */ /* initialize statics */
if (locals == NULL) { if (locals == NULL) {
locals = PyUnicode_FromString("__locals__"); locals = PyUnicode_InternFromString("__locals__");
if (locals == NULL) if (locals == NULL)
return 0; return 0;
} }
@ -2177,7 +2177,7 @@ compiler_assert(struct compiler *c, stmt_ty s)
if (Py_OptimizeFlag) if (Py_OptimizeFlag)
return 1; return 1;
if (assertion_error == NULL) { if (assertion_error == NULL) {
assertion_error = PyUnicode_FromString("AssertionError"); assertion_error = PyUnicode_InternFromString("AssertionError");
if (assertion_error == NULL) if (assertion_error == NULL)
return 0; return 0;
} }