From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 30 Oct 2009 21:45:40 +0000 (+0000)
Subject: Merged revisions 75967 via svnmerge from
X-Git-Tag: v3.2a1~2271
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aecd3b77184f5a9a16a26cec39a532a50f1ab191;p=python

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.
........
---

diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 76822afe38..56d125bd69 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -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"