mirror of
https://github.com/python/cpython.git
synced 2024-12-01 11:15:56 +01:00
Issue #18893: Fix invalid exception handling in Lib/ctypes/macholib/dyld.py
Patch by Madison May.
This commit is contained in:
parent
6129e14b21
commit
8b6b50814e
@ -135,10 +135,11 @@ def framework_find(fn, executable_path=None, env=None):
|
||||
Python.framework
|
||||
Python.framework/Versions/Current
|
||||
"""
|
||||
error = None
|
||||
try:
|
||||
return dyld_find(fn, executable_path=executable_path, env=env)
|
||||
except ValueError as e:
|
||||
pass
|
||||
error = e
|
||||
fmwk_index = fn.rfind('.framework')
|
||||
if fmwk_index == -1:
|
||||
fmwk_index = len(fn)
|
||||
@ -147,7 +148,7 @@ def framework_find(fn, executable_path=None, env=None):
|
||||
try:
|
||||
return dyld_find(fn, executable_path=executable_path, env=env)
|
||||
except ValueError:
|
||||
raise e
|
||||
raise error
|
||||
|
||||
def test_dyld_find():
|
||||
env = {}
|
||||
|
@ -80,6 +80,9 @@ Core and Builtins
|
||||
Library
|
||||
-------
|
||||
|
||||
- Issue #18893: Fix invalid exception handling in Lib/ctypes/macholib/dyld.py.
|
||||
Patch by Madison May.
|
||||
|
||||
- Issue #27611: Fixed support of default root window in the tkinter.tix module.
|
||||
|
||||
- Issue #27348: In the traceback module, restore the formatting of exception
|
||||
|
Loading…
Reference in New Issue
Block a user