summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-04-07 23:08:32 +0100
committerJason R. Coombs <jaraco@jaraco.com>2016-04-07 23:08:32 +0100
commit6462571024e69a285a17c8f790ad13774790990a (patch)
treecba9dfac4161ef5dc7e7ae407997a4d62f2a3da4
parent06eae67829fb2c292da23d941e3cc9cd9870f1ab (diff)
downloadpython-setuptools-git-6462571024e69a285a17c8f790ad13774790990a.tar.gz
Trap additional exceptions. Fixes #536.
-rw-r--r--CHANGES.rst7
-rw-r--r--setuptools/msvc9_support.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index cf18b7f7..b29977ce 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
CHANGES
=======
+v20.7
+-----
+
+* Issue #536: In msvc9_support, trap additional exceptions
+ that might occur when importing
+ ``distutils.msvc9compiler`` in mingw environments.
+
v20.6.8
-------
diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index a69c7474..9d869580 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1,6 +1,6 @@
try:
import distutils.msvc9compiler
-except ImportError:
+except Exception:
pass
unpatched = dict()