diff options
| author | Brian Curtin <brian@python.org> | 2012-10-11 21:11:37 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2012-10-11 21:11:37 (GMT) |
| commit | 859947da97b34dd792141a8eb51d656e72b40690 (patch) | |
| tree | a6c8acc322f3102b575af4dd5b64abe80c8191af /Lib/platform.py | |
| parent | c3de6d63cd20cd26a288999d454124cb72eb57fe (diff) | |
| parent | 0b960f5a583afd458d7bd7feb41a527501143b61 (diff) | |
| download | cpython-859947da97b34dd792141a8eb51d656e72b40690.zip cpython-859947da97b34dd792141a8eb51d656e72b40690.tar.gz cpython-859947da97b34dd792141a8eb51d656e72b40690.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 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: |