From c1924ab729aeb380f63a7b1c8fcb61599f272300 Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Thu, 11 Oct 2012 16:16:50 -0500 Subject: [PATCH] Fix #16176. Properly identify Windows 8 via platform.platform() Add handling of the 6.2 release line, aka Windows 8 and Windows 2012 Server. --- Lib/platform.py | 7 ++++++- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py index 20b91752f31..c0016a8198c 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 fb843126a30..7d45a89caa1 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.