merge 3.4 (#22267)

d475731c · Benjamin Peterson · cdcafb78 · 18bb7021 · d475731c
Commit d475731c authored Aug 24, 2014 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Lib/test/test_weakref.py Lib/test/test_weakref.py +2 -0

No files found.
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -1329,6 +1329,7 @@ class MappingTestCase(TestBase):
                yield Object(v), v
            finally:
                it = None           # should commit all removals
+                gc.collect()
        self.check_weak_destroy_and_mutate_while_iterating(dict, testcontext)

    def test_weak_values_destroy_while_iterating(self):
@@ -1351,6 +1352,7 @@ class MappingTestCase(TestBase):
                yield k, Object(k)
            finally:
                it = None           # should commit all removals
+                gc.collect()
        self.check_weak_destroy_and_mutate_while_iterating(dict, testcontext)

    def test_make_weak_keyed_dict_from_dict(self):