[Python-checkins] r84837 - python/branches/release31-maint/Lib/ctypes/util.py

Wed Sep 15 15:08:12 CEST 2010

Author: matthias.klose
Date: Wed Sep 15 15:08:12 2010
New Revision: 84837
Log:
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.
........
Modified:
 python/branches/release31-maint/Lib/ctypes/util.py
Modified: python/branches/release31-maint/Lib/ctypes/util.py
==============================================================================

--- python/branches/release31-maint/Lib/ctypes/util.py	(original)
+++ python/branches/release31-maint/Lib/ctypes/util.py	Wed Sep 15 15:08:12 2010
@@ -219,7 +219,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))
- 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:
 data = f.read()
 finally:
