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 35b0b1e50e9b880375b541745f4be4b87ed2c518..e2a31c8fdb257d0a5c6959bea6cf10b55b5f26ff 100644 (file)
--- 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 e5144569c79c7a21186461dceaadc2e51b8f27ce..b0c59011b03c61ccba4f88366fcebeb24b4d52af 100644 (file)
--- 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?
 ===========================