[Python-checkins] cpython (merge default -> default): merge commit.

senthil.kumaran python-checkins at python.org
Wed May 25 18:26:47 CEST 2011


http://hg.python.org/cpython/rev/c19337d5b5c3
changeset:   70379:c19337d5b5c3
parent:      70378:3e3cd0ed82bb
parent:      70376:c540b18b00b9
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Thu May 26 00:26:32 2011 +0800
summary:
  merge commit.

files:
  Lib/ctypes/util.py |  4 +---
  Misc/NEWS          |  3 +++
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -137,9 +137,7 @@
             rv = f.close()
             if rv == 10:
                 raise OSError('objdump command not found')
-            with contextlib.closing(os.popen(cmd)) as f:
-                data = f.read()
-            res = re.search(r'\sSONAME\s+([^\s]+)', data)
+            res = re.search(r'\sSONAME\s+([^\s]+)', dump)
             if not res:
                 return None
             return res.group(1)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -163,6 +163,9 @@
 
 - Issue #11109 -  New service_action method for BaseServer, used by
   ForkingMixin class for cleanup. Initial Patch by Justin Wark.
+  
+- Issue #12045: Avoid duplicate execution of command in ctypes.util._get_soname().
+  Patch by Sijin Joseph.
 
 - Issue #10818: Remove the Tk GUI and the serve() function of the pydoc module,
   pydoc -g has been deprecated in Python 3.2 and it has a new enhanced web

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list