diff options
| author | Brian Curtin <brian@python.org> | 2012-10-11 21:12:47 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2012-10-11 21:12:47 (GMT) |
| commit | e33f20c4e9b874ec2d9125633eef89549a8e8d7b (patch) | |
| tree | 7c8392f0a87429eb131833173cf2c29c6280f147 /Lib/platform.py | |
| parent | bd40d3e1442a49c4f5a2f87c1778a727fafa7bbc (diff) | |
| parent | 0b960f5a583afd458d7bd7feb41a527501143b61 (diff) | |
| download | cpython-e33f20c4e9b874ec2d9125633eef89549a8e8d7b.zip cpython-e33f20c4e9b874ec2d9125633eef89549a8e8d7b.tar.gz cpython-e33f20c4e9b874ec2d9125633eef89549a8e8d7b.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Lib/platform.py')
| -rwxr-xr-x | Lib/platform.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 1ab9c99..db08eab 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: |