diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-08-08 19:49:02 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-08-08 19:49:02 -0400 |
| commit | 148cace6a965fb8f6d9839663c025ceb321ca532 (patch) | |
| tree | b105f5ccb6d4ad43e4c248a871c34498178d2d03 /setuptools/_distutils/_msvccompiler.py | |
| parent | 6b70fb201d6a81448de6ca6f71d7091b9a26096c (diff) | |
| parent | 59e116c84d76adc9548d1e9a71e7d8f5c22a8b85 (diff) | |
| download | external_python_setuptools-148cace6a965fb8f6d9839663c025ceb321ca532.tar.gz external_python_setuptools-148cace6a965fb8f6d9839663c025ceb321ca532.tar.bz2 external_python_setuptools-148cace6a965fb8f6d9839663c025ceb321ca532.zip | |
Merge branch 'master' into distutils-import-hack
Diffstat (limited to 'setuptools/_distutils/_msvccompiler.py')
| -rw-r--r-- | setuptools/_distutils/_msvccompiler.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/setuptools/_distutils/_msvccompiler.py b/setuptools/_distutils/_msvccompiler.py index 0e98692e..2d56ee0a 100644 --- a/setuptools/_distutils/_msvccompiler.py +++ b/setuptools/_distutils/_msvccompiler.py @@ -15,7 +15,9 @@ for older versions in distutils.msvc9compiler and distutils.msvccompiler. import os import subprocess -import winreg +import contextlib +with contextlib.suppress(ImportError): + import winreg from distutils.errors import DistutilsExecError, DistutilsPlatformError, \ CompileError, LibError, LinkError @@ -501,7 +503,7 @@ class MSVCCompiler(CCompiler) : log.debug("skipping %s (up-to-date)", output_filename) def spawn(self, cmd): - env = dict(os.environ, path=self._paths) + env = dict(os.environ, PATH=self._paths) return super().spawn(cmd, env=env) # -- Miscellaneous methods ----------------------------------------- |