Change Windows 10 from SP0 to the build number.

appengine/swarming/swarming_bot/api/platforms/win.py

 # Copyright 2015 The Swarming Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 """Windows specific utility functions."""
 
 import ctypes
 import logging
 import os
 import platform
@@ skipping 64 matching lines @@
     # win32com is included in pywin32, which is an optional package that is
     # installed by Swarming devs. If you find yourself needing it to run without
     # pywin32, for example in cygwin, please send us a CL with the
     # implementation that doesn't use pywin32.
     return None
 
   wmi_service = win32com.client.Dispatch('WbemScripting.SWbemLocator')
   return wmi_service.ConnectServer('.', 'root\\cimv2')
 
 
+@tools.cached
+def _get_os_numbers():
+  """Returns the normalized OS version and build numbers as strings.
+
+  Actively work around AppCompat version lie shim.
+
+  Returns:
+    - 5.1, 6.1, etc. There is no way to distinguish between Windows 7
+      and Windows Server 2008R2 since they both report 6.1.
+  """
+  # Windows is lying to us until python adds to its manifest:
+  #   <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+  # and it doesn't.
+  # So ask nicely to cmd.exe instead, which will always happily report the right
+  # version. Here's some sample output:
+  # - XP: Microsoft Windows XP [Version 5.1.2600]
+  # - Win10: Microsoft Windows [Version 10.0.10240]
+  # - Win7 or Win2K8R2: Microsoft Windows [Version 6.1.7601]
+  out = subprocess.check_output(['cmd.exe', '/c', 'ver']).strip()
+  match = re.search(r'\[Version (\d+\.\d+)\.(\d+)\]', out, re.IGNORECASE)
+  return match.group(1), match.group(2)
+
+
 ## Public API.
 
 
 def from_cygwin_path(path):
   """Converts an absolute cygwin path to a standard Windows path."""
   if not path.startswith('/cygdrive/'):
     logging.error('%s is not a cygwin path', path)
     return None
 
   # Remove the cygwin path identifier.
@@ skipping 10 matching lines @@
     # TODO(maruel): Accept \\?\ and \??\ if necessary.
     logging.error('%s is not a win32 path', path)
     return None
   return '/cygdrive/%s/%s' % (path[0].lower(), path[3:].replace('\\', '/'))
 
 
 @tools.cached
 def get_os_version_number():
   """Returns the normalized OS version number as a string.
 
-  Actively work around AppCompat version lie shim.
-
   Returns:
-    - 5.1, 6.1, etc. There is no way to distinguish between Windows 7
-      and Windows Server 2008R2 since they both report 6.1.
+    - '5.1', '6.1', '10.0', etc. There is no way to distinguish between Windows
+      7 and Windows Server 2008R2 since they both report 6.1.
   """
-  # Windows is lying to us until python adds to its manifest:
-  #   <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-  # and it doesn't.
-  # So ask nicely to cmd.exe instead, which will always happily report the right
-  # version. Here's some sample output:
-  # - XP: Microsoft Windows XP [Version 5.1.2600]
-  # - Win10: Microsoft Windows [Version 10.0.10240]
-  # - Win7 or Win2K8R2: Microsoft Windows [Version 6.1.7601]
-  out = subprocess.check_output(['cmd.exe', '/c', 'ver']).strip()
-  return re.search(r'\[Version (\d+\.\d+)\.\d+\]', out, re.IGNORECASE).group(1)
+  return _get_os_numbers()[0]
 
 
 @tools.cached
 def get_os_version_name():
-  """Returns the marketing name of the OS including the service pack."""
+  """Returns the marketing name of the OS including the service pack.
+
+  On Windows 10, use the build number since there will be no service pack.
+  """
   # Python keeps a local map in platform.py and it is updated at newer python
   # release. Since our python release is a bit old, do not rely on it.
   is_server = sys.getwindowsversion().product_type == 3
   lookup = _WIN32_SERVER_NAMES if is_server else _WIN32_CLIENT_NAMES
-  version_number = get_os_version_number()
+  version_number, build_number = _get_os_numbers()
   marketing_name = lookup.get(version_number, version_number)
+  # Windows 10 doesn't have service packs, the build number now is the reference
+  # number.

[tandrii(chromium), 2016/03/29 15:46:27]

I think this comment should be after line 160.

[M-A Ruel, 2016/03/29 15:51:53]

Agreed, moved both the line and the comment.

   service_pack = platform.win32_ver()[2] or 'SP0'
+  if version_number == '10.0':
+    return '%s-%s' % (marketing_name, build_number)
   return '%s-%s' % (marketing_name, service_pack)
 
 
 def get_startup_dir():
   # Do not use environment variables since it wouldn't work reliably on cygwin.
   # TODO(maruel): Stop hardcoding the values and use the proper function
   # described below. Postponed to a later CL since I'll have to spend quality
   # time on Windows to ensure it works well.
   # https://msdn.microsoft.com/library/windows/desktop/bb762494.aspx
   # CSIDL_STARTUP = 7
@@ skipping 232 matching lines @@
 
 def get_uptime():
   """Return uptime for Windows 7 and later.
 
   Excludes sleep time.
   """
   val = ctypes.c_ulonglong(0)
   if ctypes.windll.kernel32.QueryUnbiasedInterruptTime(ctypes.byref(val)) != 0:
     return val.value / 10000000.
   return 0.