diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-01-19 09:09:36 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 09:09:36 +1100 |
| commit | 9a97c496dcd05e6b3d418903a3728daa790e29cc (patch) | |
| tree | e388231c970e0fb8fa544bcb3fcf95c5976d920a | |
| parent | b0138c4df9e3d287a5a2995be53746c9d0581725 (diff) | |
| download | python-setuptools-git-9a97c496dcd05e6b3d418903a3728daa790e29cc.tar.gz | |
bpo-32588: Move _findvs into its own module and add missing _queue module to installer (#5227)
| -rw-r--r-- | _msvccompiler.py | 4 | ||||
| -rw-r--r-- | command/bdist_wininst.py | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/_msvccompiler.py b/_msvccompiler.py index ef1356b9..c9d3c6c6 100644 --- a/_msvccompiler.py +++ b/_msvccompiler.py @@ -56,7 +56,7 @@ def _find_vc2015(): return best_version, best_dir def _find_vc2017(): - import _findvs + import _distutils_findvs import threading best_version = 0, # tuple for full version comparisons @@ -66,7 +66,7 @@ def _find_vc2017(): # initialize COM. all_packages = [] def _getall(): - all_packages.extend(_findvs.findall()) + all_packages.extend(_distutils_findvs.findall()) t = threading.Thread(target=_getall) t.start() t.join() diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py index 83f00732..0871a4f7 100644 --- a/command/bdist_wininst.py +++ b/command/bdist_wininst.py @@ -337,11 +337,10 @@ class bdist_wininst(Command): # cross-building, so assume the latest version bv = '14.0' else: - bv = '.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2]) - if bv in ('14.11', '14.12'): - # v142, v141 and v140 are binary compatible, - # so keep using the 14.0 stub. - bv = '14.0' + # as far as we know, CRT is binary compatible based on + # the first field, so assume 'x.0' until proven otherwise + major = CRT_ASSEMBLY_VERSION.partition('.')[0] + bv = major + '.0' # wininst-x.y.exe is in the same directory as this file |