From 0c73fc04e603be95e8609523794ad7233764e986 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 18 Dec 2013 00:29:30 +0100 Subject: [PATCH 1/2] Revert misled test change in f189da5bda26. --- Lib/test/test_weakset.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/test/test_weakset.py b/Lib/test/test_weakset.py index 5b782dae914..d8abe5e2b3b 100644 --- a/Lib/test/test_weakset.py +++ b/Lib/test/test_weakset.py @@ -371,7 +371,6 @@ class TestWeakSet(unittest.TestCase): try: it = iter(s) next(it) - del it # Schedule an item for removal and recreate it u = ustr(str(items.pop())) gc.collect() # just in case From 320b39158ebfd63f25eb5f10dd65792334445eda Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 18 Dec 2013 00:28:36 +0100 Subject: [PATCH 2/2] Issue #20006: Fix sporadic failures in test_weakset. --- Lib/_weakrefset.py | 2 ++ Lib/test/test_weakset.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/_weakrefset.py b/Lib/_weakrefset.py index 6a98b88e335..7f9923c6341 100644 --- a/Lib/_weakrefset.py +++ b/Lib/_weakrefset.py @@ -60,6 +60,8 @@ class WeakSet: for itemref in self.data: item = itemref() if item is not None: + # Caveat: the iterator will keep a strong reference to + # `item` until it is resumed or closed. yield item def __len__(self): diff --git a/Lib/test/test_weakset.py b/Lib/test/test_weakset.py index d8abe5e2b3b..fb22879dfab 100644 --- a/Lib/test/test_weakset.py +++ b/Lib/test/test_weakset.py @@ -370,9 +370,14 @@ class TestWeakSet(unittest.TestCase): def testcontext(): try: it = iter(s) - next(it) + # Start iterator + yielded = ustr(str(next(it))) # Schedule an item for removal and recreate it u = ustr(str(items.pop())) + if yielded == u: + # The iterator still has a reference to the removed item, + # advance it (issue #20006). + next(it) gc.collect() # just in case yield u finally: