Mercurial > cpython-lru_cache-weakref

diff Objects/object.c @ 53905:2993f049e2c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 72461 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72461 | benjamin.peterson | 2009-05-07 22:06:00 -0500 (Thu, 07 May 2009) | 1 line add _PyObject_LookupSpecial to handle fetching special method lookup ........
author Benjamin Peterson <benjamin@python.org>
date Fri, 08 May 2009 03:25:19 +0000
parents 911df82bc25d
children 5420dae355f7
line wrap: on
line diff
--- a/Objects/object.c	Fri May 08 02:46:09 2009 +0000
+++ b/Objects/object.c	Fri May 08 03:25:19 2009 +0000
@@ -474,12 +474,6 @@
 	PyObject *result, *func;
 	static PyObject *bytesstring = NULL;
 
-	if (bytesstring == NULL) {
-		bytesstring = PyUnicode_InternFromString("__bytes__");
-		if (bytesstring == NULL)
-			return NULL;
-	}
-
 	if (v == NULL)
 		return PyBytes_FromString("<NULL>");
 
@@ -488,10 +482,10 @@
 		return v;
 	}
 
-        /* Doesn't create a reference */
-	func = _PyType_Lookup(Py_TYPE(v), bytesstring);
+	func = _PyObject_LookupSpecial(v, "__bytes__", &bytesstring);
 	if (func != NULL) {
             result = PyObject_CallFunctionObjArgs(func, v, NULL);
+	    Py_DECREF(func);
             if (result == NULL)
 		return NULL;
             if (!PyBytes_Check(result)) {
@@ -503,7 +497,6 @@
             }
             return result;
 	}
-        PyErr_Clear();
 	return PyBytes_FromObject(v);
 }