[Python-checkins] r75968 - in python/branches/py3k: Lib/test/test_pydoc.py

Fri Oct 30 22:45:40 CET 2009

Author: antoine.pitrou
Date: Fri Oct 30 22:45:40 2009
New Revision: 75968
Log:
Merged revisions 75967 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r75967 | antoine.pitrou | 2009年10月30日 22:41:22 +0100 (ven., 30 oct. 2009) | 3 lines
 
 Try to fix transient refleaks in test_pydoc.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/test/test_pydoc.py
Modified: python/branches/py3k/Lib/test/test_pydoc.py
==============================================================================

--- python/branches/py3k/Lib/test/test_pydoc.py	(original)
+++ python/branches/py3k/Lib/test/test_pydoc.py	Fri Oct 30 22:45:40 2009
@@ -9,7 +9,8 @@
 import unittest
 import test.support
 from contextlib import contextmanager
-from test.support import TESTFN, forget, rmtree, EnvironmentVarGuard
+from test.support import (
+ TESTFN, forget, rmtree, EnvironmentVarGuard, reap_children)
 
 from test import pydoc_mod
 
@@ -195,8 +196,11 @@
 output of pydoc.
 """
 cmd = [sys.executable, pydoc.__file__, " ".join(args), module_name]
- output = subprocess.Popen(cmd, stdout=subprocess.PIPE).stdout.read()
- return output.strip()
+ try:
+ output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
+ return output.strip()
+ finally:
+ reap_children()
 
 def get_pydoc_html(module):
 "Returns pydoc generated output as html"
