[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #18893: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/708337cd8e6a
changeset:   104079:708337cd8e6a
branch:      3.6
parent:      104076:5d80a8e16edd
parent:      104078:e9f34d382eda
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Mon Sep 26 23:07:38 2016 +0300
summary:
  Issue #18893: Merge from 3.5

files:
  Lib/ctypes/macholib/dyld.py |  5 +++--
  Misc/NEWS                   |  3 +++
  2 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py
--- a/Lib/ctypes/macholib/dyld.py
+++ b/Lib/ctypes/macholib/dyld.py
@@ -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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,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.
 

-- 
Repository URL: https://hg.python.org/cpython