[Python-checkins] r78981 - in python/branches/release31-maint: Lib/ctypes/util.py Misc/NEWS

[matthias.klose]

Author: matthias.klose
Date: Mon Mar 15 14:51:00 2010
New Revision: 78981

Log:
Merged revisions 78980 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78980 | matthias.klose | 2010-03-15 14:46:04 +0100 (Mo, 15 Mär 2010) | 10 lines
  
  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/release31-maint/Lib/ctypes/util.py
   python/branches/release31-maint/Misc/NEWS

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	Mon Mar 15 14:51:00 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('/sbin/ldconfig -p 2>/dev/null')
+            f = os.popen('LANG=C /sbin/ldconfig -p 2>/dev/null')
             try:
                 data = f.read()
             finally:

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Mar 15 14:51:00 2010
@@ -17,6 +17,9 @@
 Library
 -------
 
+- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
+  the locale.
+
 
 What's New in Python 3.1.2 release candidate 1?
 ===============================================