summaryrefslogtreecommitdiffstats
path: root/Lib/_weakrefset.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-12-03 07:55:44 (GMT)
committerGeorg Brandl <georg@python.org>2010-12-03 07:55:44 (GMT)
commitf8de3fea1280d55377d40c6e04b64114f9da2fa6 (patch)
treebf723ad86ffcf6bdc2550fe6304fd384d9445e08 /Lib/_weakrefset.py
parent3b9406b08aad04c1f92d7a2ab03c8a42c3afb8be (diff)
downloadcpython-f8de3fea1280d55377d40c6e04b64114f9da2fa6.zip
cpython-f8de3fea1280d55377d40c6e04b64114f9da2fa6.tar.gz
cpython-f8de3fea1280d55377d40c6e04b64114f9da2fa6.tar.bz2
#10360: catch TypeError in WeakSet.__contains__, just like WeakKeyDictionary does.
Diffstat (limited to 'Lib/_weakrefset.py')
-rw-r--r--Lib/_weakrefset.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/_weakrefset.py b/Lib/_weakrefset.py
index 3de3bda..4265369 100644
--- a/Lib/_weakrefset.py
+++ b/Lib/_weakrefset.py
@@ -66,7 +66,11 @@ class WeakSet:
return sum(x() is not None for x in self.data)
def __contains__(self, item):
- return ref(item) in self.data
+ try:
+ wr = ref(item)
+ except TypeError:
+ return False
+ return wr in self.data
def __reduce__(self):
return (self.__class__, (list(self),),