From: Matthias Klose <doko@ubuntu.com>
Date: Sat, 20 Mar 2010 02:11:16 +0000 (+0000)
Subject: Merged revisions 78979 via svnmerge from
X-Git-Tag: v2.6.6rc1~587
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2db7bdf8b9a1f732110dd7e71f6a33d152eb0a36;p=python

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 35b0b1e50e..e2a31c8fdb 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -198,7 +198,7 @@ elif os.name == "posix":
             expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \
                    % (abi_type, re.escape(name))
             res = re.search(expr,
-                            os.popen('/sbin/ldconfig -p 2>/dev/null').read())
+                            os.popen('LANG=C /sbin/ldconfig -p 2>/dev/null').read())
             if not res:
                 return None
             return res.group(1)
diff --git a/Misc/NEWS b/Misc/NEWS
index e5144569c7..b0c59011b0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
+  the locale.
+
 
 What's New in Python 2.6.5?
 ===========================