summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-12-08 19:25:51 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2009-12-08 19:25:51 +0000
commit8c54e7819add95f28dd6dc3a4bfcb9ca596b1073 (patch)
treef2051a999e5617e6ba3080165f9849ebb2413e99
parenta254302f52ac294bb3832bf7be8e6a2274a19dca (diff)
downloadcpython-git-8c54e7819add95f28dd6dc3a4bfcb9ca596b1073.tar.gz
Fix the transient refleaks in test_zipimport_support.
Diagnosis and original patch by Florent Xicluna (flox).
-rw-r--r--Lib/test/script_helper.py3
-rw-r--r--Misc/ACKS1
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/script_helper.py b/Lib/test/script_helper.py
index af5252c8c4..f29143057d 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 28f7538e29..57972ebec1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -819,6 +819,7 @@ Gordon Worley
Thomas Wouters
Heiko Wundram
Doug Wyatt
+Florent Xicluna
Ka-Ping Yee
Bob Yodlowski
Danny Yoo