[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#22267)

[benjamin.peterson]

http://hg.python.org/cpython/rev/294b598afbb6
changeset:   92230:294b598afbb6
parent:      92226:d03730abd2f6
parent:      92229:b1c82ef96862
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Aug 24 18:04:25 2014 -0500
summary:
  merge 3.4 (#22267)

files:
  Lib/test/test_weakref.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -1329,6 +1329,7 @@
                 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 @@
                 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):

-- 
Repository URL: http://hg.python.org/cpython