mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed try/finally to contextlib.closing, as discussed in issue 6882.

Browse Source
This commit is contained in:
Eric Smith 2009-10-23 12:56:11 +00:00
parent 09d95625d9
commit 5ccfa29f04
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Lib/ctypes/util.py
View File

@ -1,4 +1,5 @@
import sys, os import sys, os
import contextlib
# find_library(name) returns the pathname of a library, or None. # find_library(name) returns the pathname of a library, or None.
if os.name == "nt": if os.name == "nt":
@ -117,11 +118,8 @@ elif os.name == "posix":
if not f: if not f:
return None return None
cmd = "/usr/ccs/bin/dump -Lpv 2>/dev/null " + f cmd = "/usr/ccs/bin/dump -Lpv 2>/dev/null " + f
f = os.popen(cmd) with contextlib.closing(os.popen(cmd)) as f:
try:
data = f.read() data = f.read()
finally:
f.close()
res = re.search(r'\[.*\]\sSONAME\s+([^\s]+)', data) res = re.search(r'\[.*\]\sSONAME\s+([^\s]+)', data)
if not res: if not res:
return None return None
@ -138,11 +136,8 @@ elif os.name == "posix":
rv = f.close() rv = f.close()
if rv == 10: if rv == 10:
raise OSError('objdump command not found') raise OSError('objdump command not found')
f = os.popen(cmd) with contextlib.closing(os.popen(cmd)) as f:
try:
data = f.read() data = f.read()
finally:
f.close()
res = re.search(r'\sSONAME\s+([^\s]+)', data) res = re.search(r'\sSONAME\s+([^\s]+)', data)
if not res: if not res:
return None return None
@ -166,11 +161,8 @@ elif os.name == "posix":
def find_library(name): def find_library(name):
ename = re.escape(name) ename = re.escape(name)
expr = r':-l%s\.\S+ => \S*/(lib%s\.\S+)' % (ename, ename) expr = r':-l%s\.\S+ => \S*/(lib%s\.\S+)' % (ename, ename)
f = os.popen('/sbin/ldconfig -r 2>/dev/null') with contextlib.closing(os.popen('/sbin/ldconfig -r 2>/dev/null')) as f:
try:
data = f.read() data = f.read()
finally:
f.close()
res = re.findall(expr, data) res = re.findall(expr, data)
if not res: if not res:
return _get_soname(_findLib_gcc(name)) return _get_soname(_findLib_gcc(name))
@ -182,20 +174,14 @@ elif os.name == "posix":
def _findLib_ldconfig(name): def _findLib_ldconfig(name):
# XXX assuming GLIBC's ldconfig (with option -p) # XXX assuming GLIBC's ldconfig (with option -p)
expr = r'/[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name) expr = r'/[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
f = os.popen('/sbin/ldconfig -p 2>/dev/null') with contextlib.closing(os.popen('/sbin/ldconfig -p 2>/dev/null')) as f:
try:
data = f.read() data = f.read()
finally:
f.close()
res = re.search(expr, data) res = re.search(expr, data)
if not res: if not res:
# Hm, this works only for libs needed by the python executable. # Hm, this works only for libs needed by the python executable.
cmd = 'ldd %s 2>/dev/null' % sys.executable cmd = 'ldd %s 2>/dev/null' % sys.executable
f = os.popen(cmd) with contextlib.closing(os.popen(cmd)) as f:
try:
data = f.read() data = f.read()
finally:
f.close()
res = re.search(expr, data) res = re.search(expr, data)
if not res: if not res:
return None return None
@ -219,11 +205,8 @@ elif os.name == "posix":
# XXX assuming GLIBC's ldconfig (with option -p) # XXX assuming GLIBC's ldconfig (with option -p)
expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \ expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \
% (abi_type, re.escape(name)) % (abi_type, re.escape(name))
f = os.popen('/sbin/ldconfig -p 2>/dev/null') with contextlib.closing(os.popen('/sbin/ldconfig -p 2>/dev/null')) as f:
try:
data = f.read() data = f.read()
finally:
f.close()
res = re.search(expr, data) res = re.search(expr, data)
if not res: if not res:
return None return None