From: Matthias Klose <doko@ubuntu.com>
Date: Mon, 15 Mar 2010 13:51:00 +0000 (+0000)
Subject: Merged revisions 78980 via svnmerge from
X-Git-Tag: v3.1.2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffb5384ab1c09dc2beae1992d98a82421414406e;p=thirdparty%2FPython%2Fcpython.git

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 1bd2d70fd375..58b0d732f8da 100644
--- 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 71db3ca41a3b..29aae7993efa 100644
--- 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?
 ===============================================