mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

static PyObject* variables should use PyString_InternFromString() instead of PyObject_FromString() to store a python string in a function level static var.

Browse source
This commit is contained in:
Christian Heimes 2008-01-28 02:07:53 +00:00
parent 908caac52e
commit d7e1b2bd17
6 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/complexobject.c
View file

@ -261,14 +261,19 @@ PyComplex_AsCComplex(PyObject *op)
return ((PyComplexObject *)op)->cval;
}
/* If not, use op's __complex__ method, if it exists */
/* return -1 on failure */
cv.real = -1.;
cv.imag = 0.;
if (complex_str == NULL) {
if (!(complex_str = PyString_InternFromString("__complex__")))
return cv;
}
if (PyInstance_Check(op)) {
/* this can go away in python 3000 */
if (PyObject_HasAttrString(op, "__complex__")) {
if (PyObject_HasAttr(op, complex_str)) {
newop = PyObject_CallMethod(op, "__complex__", NULL);
if (!newop)
return cv;
@ -276,10 +281,6 @@ PyComplex_AsCComplex(PyObject *op)
/* else try __float__ */
} else {
PyObject *complexfunc;
if (!complex_str) {
if (!(complex_str = PyString_FromString("__complex__")))
return cv;
}
complexfunc = _PyType_Lookup(op->ob_type, complex_str);
/* complexfunc is a borrowed reference */
if (complexfunc) {