summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2010-03-15 13:46:04 (GMT)
committerMatthias Klose <doko@ubuntu.com>2010-03-15 13:46:04 (GMT)
commit82f60910b7b811555dd9a9cc520523dad212946a (patch)
tree1c3faae141065a3a42f30c9d6ad1f6afd39433d8
parenta8349756faf0979b9f2b3417624aa00979732079 (diff)
downloadcpython-82f60910b7b811555dd9a9cc520523dad212946a.zip
cpython-82f60910b7b811555dd9a9cc520523dad212946a.tar.gz
cpython-82f60910b7b811555dd9a9cc520523dad212946a.tar.bz2
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. ........
-rw-r--r--Lib/ctypes/util.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index dca4ec3..1cde0e3 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -205,7 +205,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))
- with contextlib.closing(os.popen('/sbin/ldconfig -p 2>/dev/null')) as f:
+ with contextlib.closing(os.popen('LANG=C /sbin/ldconfig -p 2>/dev/null')) as f:
data = f.read()
res = re.search(expr, data)
if not res:
diff --git a/Misc/NEWS b/Misc/NEWS
index d92cb54..eade42c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -283,6 +283,9 @@ C-API
Library
-------
+- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
+ the locale.
+
- The internals of the subprocess module on POSIX systems have been replaced
by an extension module (_posixsubprocess) so that the fork()+exec() can be
done safely without the possibility of deadlock in multithreaded applications.