Index: Lib/platform.py
===================================================================
--- Lib/platform.py	(revision 58178)
+++ Lib/platform.py	(working copy)
@@ -1158,7 +1158,9 @@
         An empty string is returned if the value cannot be determined.
 
     """
-    return uname()[0]
+    systemName = uname()[0]
+    if systemName == 'Microsoft': return 'Windows'
+    return systemName
 
 def node():
 
@@ -1177,7 +1179,10 @@
         An empty string is returned if the value cannot be determined.
 
     """
-    return uname()[2]
+    unameInfo = uname()
+    if unameInfo[0] == 'Microsoft' and unameInfo == 'Windows':
+        return 'Vista'
+    return unameInfo[2]
 
 def version():