Issue #20006: Fix sporadic failures in test_weakset.

diff --git a/Lib/_weakrefset.py b/Lib/_weakrefset.py
index 990c3a6bbcdc10f1888eb13a516bb5b2e140c334..627959b62433674e4d475cb5ee498d4b10dde325 100644 (file)
--- a/Lib/_weakrefset.py
+++ b/Lib/_weakrefset.py
@@ -60,6 +60,8 @@ class WeakSet(object):
             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 6b34a8d682a3b12f16b1e88e7cedcdc3a067de7e..d735d9c255feec22a40644450aa827f1326b4ca4 100644 (file)
--- a/Lib/test/test_weakset.py
+++ b/Lib/test/test_weakset.py
@@ -473,9 +473,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: