Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge commit.

Browse source
This commit is contained in:
Senthil Kumaran 2011-05-26 00:26:32 +08:00
commit 242926d227
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/ctypes/util.py
View file

@ -137,9 +137,7 @@ def _get_soname(f):
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)

3
Misc/NEWS
View file

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