Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.2

This commit is contained in:
Brian Curtin 2012-10-11 16:11:37 -05:00
parent c3de6d63cd 0b960f5a58
commit 859947da97
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/platform.py
View File

@ -595,8 +595,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: else:
release = 'post2008Server' release = '2012Server'
else:
release = 'post2012Server'
else: else:
if not release: if not release:

2
Misc/NEWS
View File

@ -41,6 +41,8 @@ Core and Builtins
Library Library
------- -------
- Issue #16176: Properly identify Windows 8 via platform.platform()
- Issue #16114: The subprocess module no longer provides a misleading error - 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 message stating that args[0] did not exist when either the cwd or executable
keyword arguments specified a path that did not exist. keyword arguments specified a path that did not exist.