[Python-checkins] r74909 - in python/branches/release31-maint: Lib/ctypes/util.py Misc/NEWS

[eric.smith]

Author: eric.smith
Date: Fri Sep 18 15:59:58 2009
New Revision: 74909

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/ctypes/util.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/ctypes/util.py
==============================================================================
--- python/branches/release31-maint/Lib/ctypes/util.py	(original)
+++ python/branches/release31-maint/Lib/ctypes/util.py	Fri Sep 18 15:59:58 2009
@@ -219,8 +219,12 @@
             # 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)

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Fri Sep 18 15:59:58 2009
@@ -21,6 +21,8 @@
 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.