summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-10-11 21:07:52 (GMT)
committerBrian Curtin <brian@python.org>2012-10-11 21:07:52 (GMT)
commit0b960f5a583afd458d7bd7feb41a527501143b61 (patch)
tree05b1b668a39873e65831af12d530c4bafe2810ed
parentcc32a68216238d72913794cf83fc0eaf54abe0db (diff)
downloadcpython-0b960f5a583afd458d7bd7feb41a527501143b61.zip
cpython-0b960f5a583afd458d7bd7feb41a527501143b61.tar.gz
cpython-0b960f5a583afd458d7bd7feb41a527501143b61.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 eedc11c..686a045 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 9e1e96b..e1356ad 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.