Merged revisions 76716 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76716 | antoine.pitrou | 2009-12-08 20:25:51 +0100 (mar., 08 déc. 2009) | 4 lines

  Fix the transient refleaks in test_zipimport_support.
  Diagnosis and original patch by Florent Xicluna (flox).
........

diff --git a/Lib/test/script_helper.py b/Lib/test/script_helper.py
index af5252c8c4f67835aec255ab0eb986a5f476dee2..f29143057d40188ca9fb5f8e862babdbb8ba3cd2 100644 (file)
--- a/Lib/test/script_helper.py
+++ b/Lib/test/script_helper.py
@@ -30,7 +30,8 @@ def kill_python(p):
     data = p.stdout.read()
     p.stdout.close()
     # try to cleanup the child so we don't appear to leak when running
-    # with regrtest -R.  This should be a no-op on Windows.
+    # with regrtest -R.
+    p.wait()
     subprocess._cleanup()
     return data
 

diff --git a/Misc/ACKS b/Misc/ACKS
index 83205077c32eb3d7e738901bc567a459be44c914..0098bce42361c89dc132004831fc2da45f4c5014 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -832,6 +832,7 @@ Gordon Worley
 Thomas Wouters
 Heiko Wundram
 Doug Wyatt
+Florent Xicluna
 Ka-Ping Yee
 Bob Yodlowski
 Danny Yoo