From b24cd0f05af4555edafe764ef4ac1513451685cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Lemburg?= Date: Tue, 12 Jun 2007 09:26:49 +0000 Subject: [PATCH] Add patch #1726668: Windows Vista support. --- Lib/platform.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Lib/platform.py b/Lib/platform.py index f02021e482..af8acfaaaa 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -600,6 +600,16 @@ def win32_ver(release='',version='',csd='',ptype=''): release = '2003Server' else: release = 'post2003' + elif maj == 6: + if min == 0: + # Per http://msdn2.microsoft.com/en-us/library/ms724429.aspx + productType = GetVersionEx(1)[8] + if productType == 1: # VER_NT_WORKSTATION + release = 'Vista' + else: + release = '2008Server' + else: + release = 'post2008Server' else: if not release: # E.g. Win3.1 with win32s @@ -1068,6 +1078,16 @@ def uname(): # (_syscmd_ver() tends to return the vendor name as well) if system == 'Microsoft Windows': system = 'Windows' + elif system == 'Microsoft' and release == 'Windows': + # Under Windows Vista and Windows Server 2008, + # Microsoft changed the output of the ver command. The + # release is no longer printed. This causes the + # system and release to be misidentified. + system = 'Windows' + if '6.0' == version[:3]: + release = 'Vista' + else: + release = '' # In case we still don't know anything useful, we'll try to # help ourselves -- 2.50.1