1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #19734: ctypes resource management fixes

Browse Source
This commit is contained in:
Nick Coghlan 2013-11-24 12:53:50 +10:00
parent 878d258a22
commit 1889623e1a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/ctypes/util.py
View File

@ -132,8 +132,10 @@ elif os.name == "posix":
cmd = 'if ! type objdump >/dev/null 2>&1; then exit 10; fi;' \ cmd = 'if ! type objdump >/dev/null 2>&1; then exit 10; fi;' \
"objdump -p -j .dynamic 2>/dev/null " + f "objdump -p -j .dynamic 2>/dev/null " + f
f = os.popen(cmd) f = os.popen(cmd)
dump = f.read() try:
rv = f.close() dump = f.read()
finally:
rv = f.close()
if rv == 10: if rv == 10:
raise OSError('objdump command not found') raise OSError('objdump command not found')
res = re.search(r'\sSONAME\s+([^\s]+)', dump) res = re.search(r'\sSONAME\s+([^\s]+)', dump)
@ -176,10 +178,11 @@ elif os.name == "posix":
else: else:
cmd = 'env LC_ALL=C /usr/bin/crle 2>/dev/null' cmd = 'env LC_ALL=C /usr/bin/crle 2>/dev/null'
for line in os.popen(cmd).readlines(): with contextlib.closing(os.popen(cmd)) as f:
line = line.strip() for line in f.readlines():
if line.startswith('Default Library Path (ELF):'): line = line.strip()
paths = line.split()[4] if line.startswith('Default Library Path (ELF):'):
paths = line.split()[4]
if not paths: if not paths:
return None return None