From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 16 Jan 2016 21:41:48 +0000 (-0800)
Subject: Issue #25824: Fixes sys.winver to not include any architecture suffix.
X-Git-Tag: v2.7.12rc1~284
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ffee6157a0c41dcb67cc7d9d3676292c9a33932;p=thirdparty%2FPython%2Fcpython.git

Issue #25824: Fixes sys.winver to not include any architecture suffix.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 9d307bd82f51..6b5c418b1c85 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -88,6 +88,8 @@ Tests
 Build
 -----
 
+- Issue #25824: Fixes sys.winver to not include any architecture suffix.
+
 - Issue #25348: Added ``--pgo`` and ``--pgo-job`` arguments to
   ``PCbuild\build.bat`` for building with Profile-Guided Optimization.  The
   old ``PCbuild\build_pgo.bat`` script is now deprecated, and simply calls
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 245e5716bdca..ca3d10fff3b7 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -102,7 +102,6 @@
 
     <!-- The version number for sys.winver -->
     <SysWinVer>$(MajorVersionNumber).$(MinorVersionNumber)</SysWinVer>
-    <SysWinVer Condition="$(Platform) == 'Win32' or $(Platform) == 'x86'">$(SysWinVer)-32</SysWinVer>
   </PropertyGroup>
 
   <!-- Displays the calculated version info -->