Kaydet (Commit) e33f20c4 authored tarafından Brian Curtin's avatar Brian Curtin

Merge 3.2

...@@ -595,8 +595,13 @@ def win32_ver(release='',version='',csd='',ptype=''): ...@@ -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:
release = '2012Server'
else: else:
release = 'post2008Server' release = 'post2012Server'
else: else:
if not release: if not release:
......
...@@ -45,6 +45,8 @@ Core and Builtins ...@@ -45,6 +45,8 @@ Core and Builtins
Library Library
------- -------
- Issue #16176: Properly identify Windows 8 via platform.platform()
- Issue #16088: BaseHTTPRequestHandler's send_error method includes a - Issue #16088: BaseHTTPRequestHandler's send_error method includes a
Content-Length header in it's response now. Patch by Antoine Pitrou. Content-Length header in it's response now. Patch by Antoine Pitrou.
......
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