Commit c1924ab7 authored by Brian Curtin's avatar Brian Curtin

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

Add handling of the 6.2 release line, aka Windows 8 and Windows 2012 Server.
parent 1e65159b
...@@ -673,8 +673,13 @@ def win32_ver(release='',version='',csd='',ptype=''): ...@@ -673,8 +673,13 @@ def win32_ver(release='',version='',csd='',ptype=''):
release = '7' release = '7'
else: else:
release = '2008ServerR2' release = '2008ServerR2'
elif min == 2:
if product_type == VER_NT_WORKSTATION:
release = '8'
else:
release = '2012Server'
else: else:
release = 'post2008Server' release = 'post2012Server'
else: else:
if not release: if not release:
......
...@@ -119,6 +119,8 @@ Core and Builtins ...@@ -119,6 +119,8 @@ Core and Builtins
Library Library
------- -------
- Issue #16176: Properly identify Windows 8 via platform.platform()
- Issue #15756: subprocess.poll() now properly handles errno.ECHILD to - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
return a returncode of 0 when the child has already exited or cannot return a returncode of 0 when the child has already exited or cannot
be waited on. be waited on.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment