From: Brian Curtin <brian@python.org>
Date: Thu, 11 Oct 2012 21:16:50 +0000 (-0500)
Subject: Fix #16176. Properly identify Windows 8 via platform.platform()
X-Git-Tag: v2.7.4rc1~492
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1924ab729aeb380f63a7b1c8fcb61599f272300;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 20b91752f311..c0016a8198cd 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -673,8 +673,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 fb843126a301..7d45a89caa1c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -119,6 +119,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #16176: Properly identify Windows 8 via platform.platform()
+
 - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
   return a returncode of 0 when the child has already exited or cannot
   be waited on.