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.
........
This commit is contained in:
Antoine Pitrou 2009-10-30 21:45:40 +00:00
parent 046467cf9a
commit aecd3b7718
1 changed files with 7 additions and 3 deletions

View File

@ -9,7 +9,8 @@ import inspect
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 @@ def run_pydoc(module_name, *args):
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"