From f8de3fea1280d55377d40c6e04b64114f9da2fa6 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 3 Dec 2010 07:55:44 +0000 Subject: #10360: catch TypeError in WeakSet.__contains__, just like WeakKeyDictionary does. --- Lib/_weakrefset.py | 6 +++++- Lib/test/test_weakset.py | 3 ++- Misc/NEWS | 3 +++ 3 files changed, 10 insertions(+), 2 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),), diff --git a/Lib/test/test_weakset.py b/Lib/test/test_weakset.py index fe68b66..58a1f87 100644 --- a/Lib/test/test_weakset.py +++ b/Lib/test/test_weakset.py @@ -50,7 +50,8 @@ class TestWeakSet(unittest.TestCase): def test_contains(self): for c in self.letters: self.assertEqual(c in self.s, c in self.d) - self.assertRaises(TypeError, self.s.__contains__, [[]]) + # 1 is not weakref'able, but that TypeError is caught by __contains__ + self.assertNotIn(1, self.s) self.assertIn(self.obj, self.fs) del self.obj self.assertNotIn(ustr('F'), self.fs) diff --git a/Misc/NEWS b/Misc/NEWS index a6afdb9..b15721b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -33,6 +33,9 @@ Core and Builtins Library ------- +- Issue #10360: In WeakSet, do not raise TypeErrors when testing for + membership of non-weakrefable objects. + - Issue #940286: pydoc.Helper.help() ignores input/output init parameters. - Issue #1745035: Add a command size and data size limit to smtpd.py, to -- cgit v0.12