[Python-checkins] r55927 - python/trunk/Lib/platform.py

Tue Jun 12 11:26:53 CEST 2007

Author: marc-andre.lemburg
Date: Tue Jun 12 11:26:49 2007
New Revision: 55927
Modified:
 python/trunk/Lib/platform.py
Log:
Add patch #1726668: Windows Vista support.
Modified: python/trunk/Lib/platform.py
==============================================================================

--- python/trunk/Lib/platform.py	(original)
+++ python/trunk/Lib/platform.py	Tue Jun 12 11:26:49 2007
@@ -600,6 +600,16 @@
 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 @@
 # (_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
