From: Eric Smith <eric@trueblade.com>
Date: Fri, 18 Sep 2009 13:59:58 +0000 (+0000)
Subject: Merged revisions 74907 via svnmerge from
X-Git-Tag: v3.1.2rc1~518
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53cda5312a36c08cf93a63cc865aa3052cf0fff1;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 74907 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74907 | eric.smith | 2009-09-18 09:23:13 -0400 (Fri, 18 Sep 2009) | 1 line

  Issue #6882: Import uuid creates zombies processes. I used a slightly different patch than the one attached to the issue, to be consistent with the style in the rest of the module.
........
---

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 794b895aa064..1bd2d70fd375 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -219,8 +219,12 @@ elif os.name == "posix":
             # XXX assuming GLIBC's ldconfig (with option -p)
             expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \
                    % (abi_type, re.escape(name))
-            res = re.search(expr,
-                            os.popen('/sbin/ldconfig -p 2>/dev/null').read())
+            f = os.popen('/sbin/ldconfig -p 2>/dev/null')
+            try:
+                data = f.read()
+            finally:
+                f.close()
+            res = re.search(expr, data)
             if not res:
                 return None
             return res.group(1)
diff --git a/Misc/NEWS b/Misc/NEWS
index ed0692a8fb91..daeaa43c6ead 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #6882: Import uuid creates zombies processes.
+
 - Issue #6635: Fix profiler printing usage message.
 
 - Issue #6888: pdb's alias command was broken when no arguments were given.