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:
Christian Heimes 2008-01-28 02:38:20 +00:00
parent 2685563583
commit fe82e774ea
7 changed files with 20 additions and 19 deletions

View file

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