From cdc7923f6d1c9731d81f299569b1ea72de7eb212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= Date: Sat, 19 Jun 2004 17:17:00 +0000 Subject: [PATCH] Added normalization for Windows system name. Closes SF #945665. --- Lib/platform.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py index d984402cbe9..372fe921022 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -28,9 +28,10 @@ # Betancourt, Randall Hopper, Karl Putland, John Farrell, Greg # Andruk, Just van Rossum, Thomas Heller, Mark R. Levinson, Mark # Hammond, Bill Tutt, Hans Nowak, Uwe Zessin (OpenVMS support), -# Colin Kong, Trent Mick +# Colin Kong, Trent Mick, Guido van Rossum # # History: +# 1.0.3 - added normalization of Windows system name # 1.0.2 - added more Windows support # 1.0.1 - reformatted to make doc.py happy # 1.0.0 - reformatted a bit and checked into Python CVS @@ -957,6 +958,10 @@ def uname(): # platforms if use_syscmd_ver: system,release,version = _syscmd_ver(system) + # Normalize system to what win32_ver() normally returns + # (_syscmd_ver() tends to return the vendor name as well) + if system == 'Microsoft Windows': + system = 'Windows' # In case we still don't know anything useful, we'll try to # help ourselves