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.
  ........
................

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 1bd2d70fd3759160dd35e2a7d6b627128065a96a..58b0d732f8dae1578ca1fa331e5600cabd59fda8 100644 (file)
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -219,7 +219,7 @@ elif os.name == "posix":
             # 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:

diff --git a/Misc/NEWS b/Misc/NEWS
index 71db3ca41a3bfd3a9fbf0e06743352a677f7754a..29aae7993efaca4146a24bbc06d3f51aff04f1a4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,9 @@ Core and Builtins
 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?
 ===============================================