diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-10-05 10:35:00 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-10-05 10:35:00 -0700 |
| commit | c04574efb5b8c21be304320e3332075126578be6 (patch) | |
| tree | da875c595fd504d612ea0c45fb9b48769c2e4f7e /Lib | |
| parent | c9470fd344cafed40ae97f5d332e9f41108ba82a (diff) | |
| download | cpython-c04574efb5b8c21be304320e3332075126578be6.tar.gz | |
Issue #25316: distutils raises OSError instead of DistutilsPlatformError when MSVC is not installed.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/_msvccompiler.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py index 03a5f10ee7..10a9ffda24 100644 --- a/Lib/distutils/_msvccompiler.py +++ b/Lib/distutils/_msvccompiler.py @@ -28,15 +28,17 @@ import winreg 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(): |