From 645fa19f15cddeec8d882a9e1420173e7516f0e4 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 14 Dec 2017 03:00:50 -0800 Subject: [PATCH] bpo-32302: Fix distutils bdist_wininst for CRT v142 (GH-4851) (#4861) CRT v142 is binary compatible with CRT v140. (cherry picked from commit 9e7c136ad8bc8e8eec50c2a8ae5ff02752f695a2) --- Lib/distutils/command/bdist_wininst.py | 4 ++-- .../next/Library/2017-12-13-22-38-08.bpo-32302.othtTr.rst | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2017-12-13-22-38-08.bpo-32302.othtTr.rst diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py index 6309c3e248..83f0073265 100644 --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -338,8 +338,8 @@ class bdist_wininst(Command): bv = '14.0' else: bv = '.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2]) - if bv == '14.11': - # v141 and v140 are binary compatible, + if bv in ('14.11', '14.12'): + # v142, v141 and v140 are binary compatible, # so keep using the 14.0 stub. bv = '14.0' diff --git a/Misc/NEWS.d/next/Library/2017-12-13-22-38-08.bpo-32302.othtTr.rst b/Misc/NEWS.d/next/Library/2017-12-13-22-38-08.bpo-32302.othtTr.rst new file mode 100644 index 0000000000..abe51f094a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-12-13-22-38-08.bpo-32302.othtTr.rst @@ -0,0 +1,2 @@ +Fix bdist_wininst of distutils for CRT v142: it binary compatible with CRT +v140. -- 2.40.0