summaryrefslogtreecommitdiff
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-10-11 16:12:47 -0500
committerBrian Curtin <brian@python.org>2012-10-11 16:12:47 -0500
commit5d9de7595d1cb1e93add41827dfe0e64d163a7cc (patch)
treeb0d64e2f33254c7cd2f332b9f5b2e64ea99cb494 /Lib/platform.py
parent0f222c65586d6528e7bda1baa234aaa092469455 (diff)
parentfb59271bc027aa98a258424c07fc29b6e1c3ba62 (diff)
downloadcpython-5d9de7595d1cb1e93add41827dfe0e64d163a7cc.tar.gz
Merge 3.2
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-xLib/platform.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 1ab9c99b45..db08eab295 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: