[Python-checkins] r76717 - in python/branches/py3k: Lib/test/script_helper.py Misc/ACKS

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Dec  8 20:27:24 2009
New Revision: 76717

Log:
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).
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/script_helper.py
   python/branches/py3k/Misc/ACKS

Modified: python/branches/py3k/Lib/test/script_helper.py
==============================================================================
--- python/branches/py3k/Lib/test/script_helper.py	(original)
+++ python/branches/py3k/Lib/test/script_helper.py	Tue Dec  8 20:27:24 2009
@@ -30,7 +30,8 @@
     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
 

Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS	(original)
+++ python/branches/py3k/Misc/ACKS	Tue Dec  8 20:27:24 2009
@@ -832,6 +832,7 @@
 Thomas Wouters
 Heiko Wundram
 Doug Wyatt
+Florent Xicluna
 Ka-Ping Yee
 Bob Yodlowski
 Danny Yoo