[Python-checkins] r78980 - in python/branches/py3k: Lib/ctypes/util.py Misc/NEWS

Mon Mar 15 14:46:04 CET 2010

Author: matthias.klose
Date: Mon Mar 15 14:46:04 2010
New Revision: 78980
Log:
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.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/ctypes/util.py
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/ctypes/util.py
==============================================================================

--- python/branches/py3k/Lib/ctypes/util.py	(original)
+++ python/branches/py3k/Lib/ctypes/util.py	Mon Mar 15 14:46:04 2010
@@ -205,7 +205,7 @@
 # XXX assuming GLIBC's ldconfig (with option -p)
 expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \
 % (abi_type, re.escape(name))
- with contextlib.closing(os.popen('/sbin/ldconfig -p 2>/dev/null')) as f:
+ with contextlib.closing(os.popen('LANG=C /sbin/ldconfig -p 2>/dev/null')) as f:
 data = f.read()
 res = re.search(expr, data)
 if not res:
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Mon Mar 15 14:46:04 2010
@@ -283,6 +283,9 @@
 Library
 -------
 
+- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
+ the locale.
+
 - The internals of the subprocess module on POSIX systems have been replaced
 by an extension module (_posixsubprocess) so that the fork()+exec() can be
 done safely without the possibility of deadlock in multithreaded applications.
