Issue #13979: Fix ctypes.util.find_library ldconfig regex
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 52b3520..7aee0ef 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -182,28 +182,6 @@
else:
- def _findLib_ldconfig(name):
- # XXX assuming GLIBC's ldconfig (with option -p)
- expr = r'/[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
- f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null')
- try:
- data = f.read()
- finally:
- f.close()
- res = re.search(expr, data)
- if not res:
- # Hm, this works only for libs needed by the python executable.
- cmd = 'ldd %s 2>/dev/null' % sys.executable
- f = os.popen(cmd)
- try:
- data = f.read()
- finally:
- f.close()
- res = re.search(expr, data)
- if not res:
- return None
- return res.group(0)
-
def _findSoname_ldconfig(name):
import struct
if struct.calcsize('l') == 4:
@@ -220,8 +198,7 @@
abi_type = mach_map.get(machine, 'libc6')
# XXX assuming GLIBC's ldconfig (with option -p)
- expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \
- % (abi_type, re.escape(name))
+ expr = r'\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type)
f = os.popen('/sbin/ldconfig -p 2>/dev/null')
try:
data = f.read()
diff --git a/Misc/NEWS b/Misc/NEWS
index ce39863..b8bcc21 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -90,6 +90,9 @@
Library
-------
+- Issue #13979: A bug in ctypes.util.find_library that caused
+ the wrong library name to be returned has been fixed.
+
- Issue #13993: HTMLParser is now able to handle broken end tags.
- Issue #13960: HTMLParser is now able to handle broken comments.