mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

*sigh* deal with instances correctly

Browse source
This commit is contained in:
Benjamin Peterson 2009-05-09 17:23:03 +00:00
parent 0a32f9c448
commit 784d455066
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_enumerate.py
View file

@ -141,6 +141,12 @@ class TestReversed(unittest.TestCase):
# don't allow keyword arguments # don't allow keyword arguments
self.assertRaises(TypeError, reversed, [], a=1) self.assertRaises(TypeError, reversed, [], a=1)
def test_class_class(self):
class A:
def __reversed__(self):
return [2, 1]
self.assertEqual(list(reversed(A())), [2, 1])
def test_xrange_optimization(self): def test_xrange_optimization(self):
x = xrange(1) x = xrange(1)
self.assertEqual(type(reversed(x)), type(iter(x))) self.assertEqual(type(reversed(x)), type(iter(x)))

13
Objects/enumobject.c
View file

@ -232,7 +232,18 @@ reversed_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (!PyArg_UnpackTuple(args, "reversed", 1, 1, &seq) ) if (!PyArg_UnpackTuple(args, "reversed", 1, 1, &seq) )
return NULL; return NULL;
reversed_meth = _PyObject_LookupSpecial(seq, "__reversed__", &reversed_cache); if (PyInstance_Check(seq)) {
reversed_meth = PyObject_GetAttrString(seq, "__reversed__");
if (reversed_meth == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_Clear();
else
return NULL;
}
}
else
reversed_meth = _PyObject_LookupSpecial(seq, "__reversed__",
&reversed_cache);
if (reversed_meth != NULL) { if (reversed_meth != NULL) {
PyObject *res = PyObject_CallFunctionObjArgs(reversed_meth, NULL); PyObject *res = PyObject_CallFunctionObjArgs(reversed_meth, NULL);
Py_DECREF(reversed_meth); Py_DECREF(reversed_meth);