[Python-checkins] python/dist/src/Lib platform.py,1.13,1.14

[lemburg at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25682

Modified Files:
	platform.py 
Log Message:
Added normalization for Windows system name. Closes                                orm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/platform.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** platform.py	4 May 2004 18:18:59 -0000	1.13
--- platform.py	19 Jun 2004 17:17:00 -0000	1.14
***************
*** 29,35 ****
  #      Andruk, Just van Rossum, Thomas Heller, Mark R. Levinson, Mark
  #      Hammond, Bill Tutt, Hans Nowak, Uwe Zessin (OpenVMS support),
! #      Colin Kong, Trent Mick
  #
  #    History:
  #    1.0.2 - added more Windows support
  #    1.0.1 - reformatted to make doc.py happy
--- 29,36 ----
  #      Andruk, Just van Rossum, Thomas Heller, Mark R. Levinson, Mark
  #      Hammond, Bill Tutt, Hans Nowak, Uwe Zessin (OpenVMS support),
! #      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
***************
*** 958,961 ****
--- 959,966 ----
          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