[Python-checkins] cpython (3.5): Issue #25316: distutils raises OSError instead of DistutilsPlatformError when

[steve.dower]

https://hg.python.org/cpython/rev/a2016b29762c
changeset:   98542:a2016b29762c
branch:      3.5
parent:      98540:ba956289fe66
user:        Steve Dower <steve.dower at microsoft.com>
date:        Mon Oct 05 10:35:00 2015 -0700
summary:
  Issue #25316: distutils raises OSError instead of DistutilsPlatformError when MSVC is not installed.

files:
  Lib/distutils/_msvccompiler.py |  18 ++++++++++--------
  Misc/NEWS                      |   3 +++
  2 files changed, 13 insertions(+), 8 deletions(-)


diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py
--- a/Lib/distutils/_msvccompiler.py
+++ b/Lib/distutils/_msvccompiler.py
@@ -28,15 +28,17 @@
 from itertools import count
 
 def _find_vcvarsall(plat_spec):
-    with winreg.OpenKeyEx(
-        winreg.HKEY_LOCAL_MACHINE,
-        r"Software\Microsoft\VisualStudio\SxS\VC7",
-        access=winreg.KEY_READ | winreg.KEY_WOW64_32KEY
-    ) as key:
-        if not key:
-            log.debug("Visual C++ is not registered")
-            return None, None
+    try:
+        key = winreg.OpenKeyEx(
+            winreg.HKEY_LOCAL_MACHINE,
+            r"Software\Microsoft\VisualStudio\SxS\VC7",
+            access=winreg.KEY_READ | winreg.KEY_WOW64_32KEY
+        )
+    except OSError:
+        log.debug("Visual C++ is not registered")
+        return None, None
 
+    with key:
         best_version = 0
         best_dir = None
         for i in count():
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,9 @@
 Library
 -------
 
+- Issue #25316: distutils raises OSError instead of DistutilsPlatformError
+  when MSVC is not installed.
+
 - Issue #23972: Updates asyncio datagram create method allowing reuseport
   and reuseaddr socket options to be set prior to binding the socket.
   Mirroring the existing asyncio create_server method the reuseaddr option

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