summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2003-05-25 17:44:31 (GMT)
committerTim Peters <tim.peters@gmail.com>2003-05-25 17:44:31 (GMT)
commit50d8b8b6ae320d08acc07601cca58cd52299ac76 (patch)
treeec3bb82cc33d24bf68cca082595b7113d053c6e3 /Lib/test
parent886128f4f8b30b7e3623418eab063a3a8dd3495c (diff)
downloadcpython-50d8b8b6ae320d08acc07601cca58cd52299ac76.zip
cpython-50d8b8b6ae320d08acc07601cca58cd52299ac76.tar.gz
cpython-50d8b8b6ae320d08acc07601cca58cd52299ac76.tar.bz2
Fleshed out WeakKeyDictionary.__delitem__ NEWS to cover issues raised on
Python-Dev. Fixed typos in test comments. Added some trivial new test guts to show the parallelism (now) among __delitem__, __setitem__ and __getitem__ wrt error conditions. Still a bugfix candidate for 2.2.3 final, but waiting for Fred to get a chance to chime in.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_weakref.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index c5fbb8d..5969f35 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -520,8 +520,15 @@ class MappingTestCase(TestBase):
d = weakref.WeakKeyDictionary()
o = Object('1')
# An attempt to delete an object that isn't there should raise
- # KetError. It didn't before 2.3.
+ # KeyError. It didn't before 2.3.
self.assertRaises(KeyError, d.__delitem__, o)
+ self.assertRaises(KeyError, d.__getitem__, o)
+
+ # If a key isn't of a weakly referencable type, __getitem__ and
+ # __setitem__ raise TypeError. __delitem__ should too.
+ self.assertRaises(TypeError, d.__delitem__, 13)
+ self.assertRaises(TypeError, d.__getitem__, 13)
+ self.assertRaises(TypeError, d.__setitem__, 13, 13)
def test_weak_keyed_cascading_deletes(self):
# SF bug 742860. For some reason, before 2.3 __delitem__ iterated
@@ -552,12 +559,13 @@ class MappingTestCase(TestBase):
# Reverse it, so that the iteration implementation of __delitem__
# has to keep looping to find the first object we delete.
objs.reverse()
+
# Turn on mutation in C.__eq__. The first time thru the loop,
# under the iterkeys() business the first comparison will delete
# the last item iterkeys() would see, and that causes a
# RuntimeError: dictionary changed size during iteration
# when the iterkeys() loop goes around to try comparing the next
- # key. After ths was fixed, it just deletes the last object *our*
+ # key. After this was fixed, it just deletes the last object *our*
# "for o in obj" loop would have gotten to.
mutate = True
count = 0