Mercurial > cpython-lru_cache-weakref

diff Objects/complexobject.c @ 45029:ef2d3bf8383d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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. ........
author Christian Heimes <christian@cheimes.de>
date Mon, 28 Jan 2008 02:38:20 +0000
parents a6f9a2ba8962
children 7c4c46342137
line wrap: on
line diff
--- a/Objects/complexobject.c	Sun Jan 27 23:50:43 2008 +0000
+++ b/Objects/complexobject.c	Mon Jan 28 02:38:20 2008 +0000
@@ -265,13 +265,14 @@
 	/* 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) {