From 4e7dc5fae919210598d68f740d9d7d4c3af412f6 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 8 Dec 2009 19:27:24 +0000 Subject: Merged revisions 76716 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ 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). ........ --- Lib/test/script_helper.py | 3 ++- Misc/ACKS | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/test/script_helper.py b/Lib/test/script_helper.py index af5252c..f291430 100644 --- 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 8320507..0098bce 100644 --- 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 -- cgit v0.12