diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2011-05-25 16:26:32 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2011-05-25 16:26:32 (GMT) |
| commit | 242926d227445857efd5981dab67cdaf5657e25a (patch) | |
| tree | d27006d8d61227845ae80d1727af9930887314ba | |
| parent | 656ce500a641a30d436da7a9c29816cedbc0e093 (diff) | |
| parent | b46004c94f59af1adc081d2a89d9e3f73998ee59 (diff) | |
| download | cpython-242926d227445857efd5981dab67cdaf5657e25a.zip cpython-242926d227445857efd5981dab67cdaf5657e25a.tar.gz cpython-242926d227445857efd5981dab67cdaf5657e25a.tar.bz2 | |
merge commit.
| -rw-r--r-- | Lib/ctypes/util.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index e4c204d..6815f94 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -137,9 +137,7 @@ elif os.name == "posix": 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) @@ -163,6 +163,9 @@ Library - 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 |