changeset:   104080:b9d9c49d5b50
parent:      104077:a579a0354d85
parent:      104079:708337cd8e6a
user:        Berker Peksag <berker.peksag@gmail.com>
date:        Mon Sep 26 23:07:58 2016 +0300
files:       Misc/NEWS
description:
Issue #18893: Merge from 3.6


diff -r a579a0354d85 -r b9d9c49d5b50 Lib/ctypes/macholib/dyld.py
--- a/Lib/ctypes/macholib/dyld.py	Mon Sep 26 23:01:42 2016 +0300
+++ b/Lib/ctypes/macholib/dyld.py	Mon Sep 26 23:07:58 2016 +0300
@@ -135,10 +135,11 @@
         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 @@
     try:
         return dyld_find(fn, executable_path=executable_path, env=env)
     except ValueError:
-        raise e
+        raise error
 
 def test_dyld_find():
     env = {}
diff -r a579a0354d85 -r b9d9c49d5b50 Misc/NEWS
--- a/Misc/NEWS	Mon Sep 26 23:01:42 2016 +0300
+++ b/Misc/NEWS	Mon Sep 26 23:07:58 2016 +0300
@@ -47,6 +47,9 @@
 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.