mirror of
https://github.com/python/cpython.git
synced 2025-11-12 07:02:33 +00:00
Merged revisions 74907 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r74907 | eric.smith | 2009-09-18 09:23:13 -0400 (Fri, 18 Sep 2009) | 1 line Issue #6882: Import uuid creates zombies processes. I used a slightly different patch than the one attached to the issue, to be consistent with the style in the rest of the module. ........
This commit is contained in:
parent
182dffae35
commit
53cda5312a
2 changed files with 8 additions and 2 deletions
|
|
@ -219,8 +219,12 @@ elif os.name == "posix":
|
||||||
# XXX assuming GLIBC's ldconfig (with option -p)
|
# XXX assuming GLIBC's ldconfig (with option -p)
|
||||||
expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \
|
expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \
|
||||||
% (abi_type, re.escape(name))
|
% (abi_type, re.escape(name))
|
||||||
res = re.search(expr,
|
f = os.popen('/sbin/ldconfig -p 2>/dev/null')
|
||||||
os.popen('/sbin/ldconfig -p 2>/dev/null').read())
|
try:
|
||||||
|
data = f.read()
|
||||||
|
finally:
|
||||||
|
f.close()
|
||||||
|
res = re.search(expr, data)
|
||||||
if not res:
|
if not res:
|
||||||
return None
|
return None
|
||||||
return res.group(1)
|
return res.group(1)
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,8 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #6882: Import uuid creates zombies processes.
|
||||||
|
|
||||||
- Issue #6635: Fix profiler printing usage message.
|
- Issue #6635: Fix profiler printing usage message.
|
||||||
|
|
||||||
- Issue #6888: pdb's alias command was broken when no arguments were given.
|
- Issue #6888: pdb's alias command was broken when no arguments were given.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue