From: Brian Curtin <brian@python.org>
Date: Thu, 11 Oct 2012 21:07:52 +0000 (-0500)
Subject: Fix #16176. Properly identify Windows 8 via platform.platform()
X-Git-Tag: v3.2.4rc1~450
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b960f5a583afd458d7bd7feb41a527501143b61;p=thirdparty%2FPython%2Fcpython.git

Fix #16176. Properly identify Windows 8 via platform.platform()

Add handling of the 6.2 release line, aka Windows 8 and Windows 2012 Server.
---

diff --git a/Lib/platform.py b/Lib/platform.py
index eedc11c518d1..686a04584538 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -668,8 +668,13 @@ def win32_ver(release='',version='',csd='',ptype=''):
                     release = '7'
                 else:
                     release = '2008ServerR2'
+            elif min == 2:
+                if product_type == VER_NT_WORKSTATION:
+                    release = '8'
+                else:
+                    release = '2012Server'
             else:
-                release = 'post2008Server'
+                release = 'post2012Server'
 
     else:
         if not release:
diff --git a/Misc/NEWS b/Misc/NEWS
index 9e1e96b55e40..e1356add4720 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -129,6 +129,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #16176: Properly identify Windows 8 via platform.platform()
+
 - Issue #16114: The subprocess module no longer provides a misleading
   error message stating that args[0] did not exist when either the cwd or
   executable keyword arguments specified a path that did not exist.