diff options
| author | Fred Drake <fdrake@acm.org> | 2001-08-03 04:11:27 (GMT) |
|---|---|---|
| committer | Fred Drake <fdrake@acm.org> | 2001-08-03 04:11:27 (GMT) |
| commit | 4fd06e0170aa75e4873b73f733bfd3f3de19d967 (patch) | |
| tree | fc63ca7a172058454f2354727e6b17c16fb635c1 | |
| parent | 5d548796474d63db729903cd67a21e0a9f1e6666 (diff) | |
| download | cpython-4fd06e0170aa75e4873b73f733bfd3f3de19d967.zip cpython-4fd06e0170aa75e4873b73f733bfd3f3de19d967.tar.gz cpython-4fd06e0170aa75e4873b73f733bfd3f3de19d967.tar.bz2 | |
Make sure that WeakValueDictionary[] raises KeyError instead of TypeError
for keys that are not in the dictionary.
| -rw-r--r-- | Lib/test/test_weakref.py | 5 | ||||
| -rw-r--r-- | Lib/weakref.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index bb4ce76..341d53f 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -252,6 +252,11 @@ class MappingTestCase(TestBase): del objects, o self.assert_(len(dict) == 0, "deleting the values did not clear the dictionary") + # regression on SF bug #447152: + dict = weakref.WeakValueDictionary() + self.assertRaises(KeyError, dict.__getitem__, 1) + dict[2] = C() + self.assertRaises(KeyError, dict.__getitem__, 2) def test_weak_keys(self): # diff --git a/Lib/weakref.py b/Lib/weakref.py index cf950ba..1d21e79 100644 --- a/Lib/weakref.py +++ b/Lib/weakref.py @@ -41,7 +41,7 @@ class WeakValueDictionary(UserDict.UserDict): # way in). def __getitem__(self, key): - o = self.data.get(key)() + o = self.data[key]() if o is None: raise KeyError, key else: |