mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 84836 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84836 | matthias.klose | 2010-09-15 15:06:09 +0200 (Mi, 15 Sep 2010) | 3 lines

  Try harder on issue #7356: ctypes.util: Make parsing of ldconfig output
  independent of the locale. Set LC_ALL=C too.
........
This commit is contained in:
Matthias Klose 2010-09-15 13:08:12 +00:00
parent 25d535ea6a
commit f01611979b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/ctypes/util.py
View File

@ -219,7 +219,7 @@ def _findSoname_ldconfig(name):
# 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('LANG=C /sbin/ldconfig -p 2>/dev/null') f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null')
try: try:
data = f.read() data = f.read()
finally: finally: