mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-12 19:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use a different VER command output parser to address the localization

Browse source 
issues mentioned in #3410.

Prepare for Windows 7 (still commented out).
This commit is contained in:
Marc-André Lemburg 2009-07-13 21:28:33 +00:00
parent 19e5b3f9d1
commit cecaa65f65
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/platform.py
View file

@ -464,7 +464,16 @@ def _norm_version(version, build=''):
_ver_output = re.compile(r'(?:([\w ]+) ([\w.]+) ' _ver_output = re.compile(r'(?:([\w ]+) ([\w.]+) '
'.*' '.*'
'Version ([\d.]+))') '\[.* ([\d.]+)\])')
# Examples of VER command output:
#
# Windows 2000: Microsoft Windows 2000 [Version 5.00.2195]
# Windows XP: Microsoft Windows XP [Version 5.1.2600]
# Windows Vista: Microsoft Windows [Version 6.0.6002]
#
# Note that the "Version" string gets localized on different
# Windows versions.
def _syscmd_ver(system='', release='', version='', def _syscmd_ver(system='', release='', version='',
@ -596,6 +605,7 @@ def win32_ver(release='',version='',csd='',ptype=''):
version = '%i.%i.%i' % (maj,min,buildno & 0xFFFF) version = '%i.%i.%i' % (maj,min,buildno & 0xFFFF)
if csd[:13] == 'Service Pack ': if csd[:13] == 'Service Pack ':
csd = 'SP' + csd[13:] csd = 'SP' + csd[13:]
if plat == VER_PLATFORM_WIN32_WINDOWS: if plat == VER_PLATFORM_WIN32_WINDOWS:
regkey = 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion' regkey = 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion'
# Try to guess the release name # Try to guess the release name
@ -610,6 +620,7 @@ def win32_ver(release='',version='',csd='',ptype=''):
release = 'postMe' release = 'postMe'
elif maj == 5: elif maj == 5:
release = '2000' release = '2000'
elif plat == VER_PLATFORM_WIN32_NT: elif plat == VER_PLATFORM_WIN32_NT:
regkey = 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion' regkey = 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion'
if maj <= 4: if maj <= 4:
@ -638,8 +649,12 @@ def win32_ver(release='',version='',csd='',ptype=''):
release = 'Vista' release = 'Vista'
else: else:
release = '2008Server' release = '2008Server'
#elif min == 1:
# # Windows 7 release candidate uses version 6.1.7100
# release = '7RC'
else: else:
release = 'post2008Server' release = 'post2008Server'
else: else:
if not release: if not release:
# E.g. Win3.1 with win32s # E.g. Win3.1 with win32s
@ -1114,7 +1129,7 @@ def uname():
node = _node() node = _node()
machine = '' machine = ''
use_syscmd_ver = 01 use_syscmd_ver = 1
# Try win32_ver() on win32 platforms # Try win32_ver() on win32 platforms
if system == 'win32': if system == 'win32':