[Python-checkins] r72511 - in python/branches/py3k: Lib/test/test_descr.py Objects/enumobject.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat May  9 19:21:13 2009
New Revision: 72511

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_descr.py
   python/branches/py3k/Objects/enumobject.c

Modified: python/branches/py3k/Lib/test/test_descr.py
==============================================================================
--- python/branches/py3k/Lib/test/test_descr.py	(original)
+++ python/branches/py3k/Lib/test/test_descr.py	Sat May  9 19:21:13 2009
@@ -1549,12 +1549,15 @@
             return self
         def hello(self):
             return b"hello"
+        def empty_seq(self):
+            return []
 
         # It would be nice to have every special method tested here, but I'm
         # only listing the ones I can remember outside of typeobject.c, since it
         # does it right.
         specials = [
             ("__bytes__", bytes, hello),
+            ("__reversed__", reversed, empty_seq),
             # These two fail because the compiler generates LOAD_ATTR to look
             # them up.  We'd have to add a new opcode to fix this, and it's
             # probably not worth it.

Modified: python/branches/py3k/Objects/enumobject.c
==============================================================================
--- python/branches/py3k/Objects/enumobject.c	(original)
+++ python/branches/py3k/Objects/enumobject.c	Sat May  9 19:21:13 2009
@@ -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,