diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py index dc7052e7470..c158e672f05 100644 --- a/Lib/ctypes/macholib/dyld.py +++ b/Lib/ctypes/macholib/dyld.py @@ -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 = {} diff --git a/Misc/NEWS b/Misc/NEWS index 59c338f191e..224f5f6ab18 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -47,6 +47,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. Added the master parameter in the DisplayStyle constructor.