Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #16991: Do not return None from OrderedDict.__reversed__.

This commit is contained in:
Eric Snow 2015-05-30 11:43:36 -06:00
parent c5e59609ac
commit 67fb92e8c6
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/test/test_collections.py
View File

@ -1773,6 +1773,19 @@ class OrderedDictTests:
self.assertEqual(sorted(reversed(od)), self.assertEqual(sorted(reversed(od)),
sorted([t[0] for t in reversed(pairs)])) sorted([t[0] for t in reversed(pairs)]))
def test_iterators_empty(self):
OrderedDict = self.module.OrderedDict
od = OrderedDict()
empty = []
self.assertEqual(list(od), empty)
self.assertEqual(list(od.keys()), empty)
self.assertEqual(list(od.values()), empty)
self.assertEqual(list(od.items()), empty)
self.assertEqual(list(reversed(od)), empty)
self.assertEqual(list(reversed(od.keys())), empty)
self.assertEqual(list(reversed(od.values())), empty)
self.assertEqual(list(reversed(od.items())), empty)
def test_popitem(self): def test_popitem(self):
OrderedDict = self.module.OrderedDict OrderedDict = self.module.OrderedDict
pairs = [('c', 1), ('b', 2), ('a', 3), ('d', 4), ('e', 5), ('f', 6)] pairs = [('c', 1), ('b', 2), ('a', 3), ('d', 4), ('e', 5), ('f', 6)]
@ -1965,7 +1978,6 @@ class OrderedDictTests:
od = OrderedDict(**d) od = OrderedDict(**d)
self.assertGreater(sys.getsizeof(od), sys.getsizeof(d)) self.assertGreater(sys.getsizeof(od), sys.getsizeof(d))
OrderedDict = self.module.OrderedDict
def test_override_update(self): def test_override_update(self):
OrderedDict = self.module.OrderedDict OrderedDict = self.module.OrderedDict
# Verify that subclasses can override update() without breaking __init__() # Verify that subclasses can override update() without breaking __init__()

3
Objects/odictobject.c
View File

@ -1357,9 +1357,6 @@ static PyObject * odictiter_new(PyODictObject *, int);
static PyObject * static PyObject *
odict_reversed(PyODictObject *od) odict_reversed(PyODictObject *od)
{ {
if (_odict_EMPTY(od)) {
Py_RETURN_NONE;
}
return odictiter_new(od, _odict_ITER_KEYS|_odict_ITER_REVERSED); return odictiter_new(od, _odict_ITER_KEYS|_odict_ITER_REVERSED);
} }