summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-10-11 21:11:37 (GMT)
committerBrian Curtin <brian@python.org>2012-10-11 21:11:37 (GMT)
commit859947da97b34dd792141a8eb51d656e72b40690 (patch)
treea6c8acc322f3102b575af4dd5b64abe80c8191af
parentc3de6d63cd20cd26a288999d454124cb72eb57fe (diff)
parent0b960f5a583afd458d7bd7feb41a527501143b61 (diff)
downloadcpython-859947da97b34dd792141a8eb51d656e72b40690.zip
cpython-859947da97b34dd792141a8eb51d656e72b40690.tar.gz
cpython-859947da97b34dd792141a8eb51d656e72b40690.tar.bz2
Merge 3.2
-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 769fe88..2b8a24a 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -595,8 +595,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 5a25f58..a9be99d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,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.