diff Objects/enumobject.c @ 53950:afd62eb1692e

Merged revisions 72495 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72495 | benjamin.peterson | 2009-05-08 21:07:04 -0500 (Fri, 08 May 2009) | 1 line lookup __reversed__ correctly as a special method ........
author Benjamin Peterson <benjamin@python.org>
date Sat, 09 May 2009 17:21:13 +0000
parents 87fbbf22adf3
children db212869d814
line wrap: on
line diff
--- a/Objects/enumobject.c	Sat May 09 11:55:12 2009 +0000
+++ b/Objects/enumobject.c	Sat May 09 17:21:13 2009 +0000
@@ -222,7 +222,8 @@
 reversed_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
 	Py_ssize_t n;
-	PyObject *seq;
+	PyObject *seq, *reversed_meth;
+	static PyObject *reversed_cache = NULL;
 	reversedobject *ro;
 
 	if (type == &PyReversed_Type && !_PyArg_NoKeywords("reversed()", kwds))
@@ -231,8 +232,12 @@
 	if (!PyArg_UnpackTuple(args, "reversed", 1, 1, &seq) )
 		return NULL;
 
-	if (PyObject_HasAttrString(seq, "__reversed__"))
-		return PyObject_CallMethod(seq, "__reversed__", NULL);
+	reversed_meth = _PyObject_LookupSpecial(seq, "__reversed__", &reversed_cache);
+	if (reversed_meth != NULL) {
+		PyObject *res = PyObject_CallFunctionObjArgs(reversed_meth, NULL);
+		Py_DECREF(reversed_meth);
+		return res;
+	}
 
 	if (!PySequence_Check(seq)) {
 		PyErr_SetString(PyExc_TypeError,