diff options
| -rw-r--r-- | Lib/test/test_dict.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 12 | ||||
| -rw-r--r-- | Objects/dictobject.c | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py index e99c46d965..8da0915346 100644 --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -189,14 +189,6 @@ class DictTest(unittest.TestCase): self.assertRaises(ValueError, {}.update, [(1, 2, 3)]) - # SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses - class KeyUpperDict(dict): - def __getitem__(self, key): - return key.upper() - d.clear() - d.update(KeyUpperDict.fromkeys('abc')) - self.assertEqual(d, {'a':'A', 'b':'B', 'c':'C'}) - def test_fromkeys(self): self.assertEqual(dict.fromkeys('abc'), {'a':None, 'b':None, 'c':None}) d = {} @@ -4,6 +4,18 @@ Python News (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.5.1? +============================= + +*Release date: XX-APR-2007* + +Core and builtins +----------------- + +- Revert SF #1615701: dict.update() does *not* call __getitem__() or keys() + if subclassed. This is to remain consistent with 2.5. + + What's New in Python 2.5.1c1? ============================= diff --git a/Objects/dictobject.c b/Objects/dictobject.c index bc3cd53ebe..af0d6f37ae 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1352,7 +1352,7 @@ PyDict_Merge(PyObject *a, PyObject *b, int override) return -1; } mp = (dictobject*)a; - if (PyDict_CheckExact(b)) { + if (PyDict_Check(b)) { other = (dictobject*)b; if (other == mp || other->ma_used == 0) /* a.update(a) or a.update({}); nothing to do */ |