Merged revisions 78979 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78979 | matthias.klose | 2010-03-15 14:42:23 +0100 (Mo, 15 Mär 2010) | 3 lines

  - Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
    the locale.
........
This commit is contained in:
Matthias Klose 2010-03-20 02:11:16 +00:00
parent c694183625
commit 2db7bdf8b9
2 changed files with 4 additions and 1 deletions

View File

@ -198,7 +198,7 @@ elif os.name == "posix":
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))
res = re.search(expr, res = re.search(expr,
os.popen('/sbin/ldconfig -p 2>/dev/null').read()) os.popen('LANG=C /sbin/ldconfig -p 2>/dev/null').read())
if not res: if not res:
return None return None
return res.group(1) return res.group(1)

View File

@ -15,6 +15,9 @@ Core and Builtins
Library Library
------- -------
- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
the locale.
What's New in Python 2.6.5? What's New in Python 2.6.5?
=========================== ===========================