summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-10-11 21:16:50 (GMT)
committerBrian Curtin <brian@python.org>2012-10-11 21:16:50 (GMT)
commitc1924ab729aeb380f63a7b1c8fcb61599f272300 (patch)
treecd0b4efde602db6cbe6854b987b5eb14136adc43
parent1e65159b340d4c91abd5a3bf5e6068f1d7cd50aa (diff)
downloadcpython-c1924ab729aeb380f63a7b1c8fcb61599f272300.zip
cpython-c1924ab729aeb380f63a7b1c8fcb61599f272300.tar.gz
cpython-c1924ab729aeb380f63a7b1c8fcb61599f272300.tar.bz2
Fix #16176. Properly identify Windows 8 via platform.platform()
Add handling of the 6.2 release line, aka Windows 8 and Windows 2012 Server.
-rwxr-xr-xLib/platform.py7
-rw-r--r--Misc/NEWS2
2 files changed, 8 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 20b9175..c0016a8 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 fb84312..7d45a89 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.