summaryrefslogtreecommitdiffstats
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-12 16:04:32 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-10-12 16:04:32 (GMT)
commit143d034ecd110f8543eba4ad76dfb6085cdaeb3d (patch)
tree9ddcfc6fe0d0cf8ce8558f88969bf1f9e98c1d25 /Lib/platform.py
parentc3de6d63cd20cd26a288999d454124cb72eb57fe (diff)
parent7a9953edfbbd51dbda60ab31c0e5db5eea968b53 (diff)
downloadcpython-143d034ecd110f8543eba4ad76dfb6085cdaeb3d.zip
cpython-143d034ecd110f8543eba4ad76dfb6085cdaeb3d.tar.gz
cpython-143d034ecd110f8543eba4ad76dfb6085cdaeb3d.tar.bz2
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 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: