Run pyformat on all the toolchain-utils files.

This gets rid of a lot of lint issues.
Ran by doing this:

for f in *.py; do echo -n "$f " ; if [ -x $f ]; then pyformat -i
--remove_trailing_comma --yapf --force_quote_type=double $f ; else
pyformat -i --remove_shebang --remove_trailing_comma --yapf
--force_quote_type=double $f ; fi ; done

BUG=chromium:567921
TEST=Ran simple crosperf run.

Change-Id: I59778835fdaa5f706d2e1765924389f9e97433d1
Reviewed-on: https://chrome-internal-review.googlesource.com/242031
Reviewed-by: Luis Lozano <llozano@chromium.org>
Commit-Queue: Luis Lozano <llozano@chromium.org>
Tested-by: Luis Lozano <llozano@chromium.org>
Reviewed-by: Yunlian Jiang <yunlian@google.com>

1 files changed, 48 insertions, 29 deletions

diff --git a/crosperf/label.py b/crosperf/label.py
index a34416d2..b9fc9330 100644
--- a/crosperf/label.py
+++ b/crosperf/label.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-
 """The label of benchamrks."""
 
 from __future__ import print_function
@@ -16,15 +15,25 @@ from cros_utils import misc
 
 class Label(object):
   """The label class."""
-  def __init__(self, name, chromeos_image, chromeos_root, board, remote,
-               image_args, cache_dir, cache_only, log_level, compiler,
+
+  def __init__(self,
+               name,
+               chromeos_image,
+               chromeos_root,
+               board,
+               remote,
+               image_args,
+               cache_dir,
+               cache_only,
+               log_level,
+               compiler,
                chrome_src=None):
 
     self.image_type = self._GetImageType(chromeos_image)
 
     # Expand ~
     chromeos_root = os.path.expanduser(chromeos_root)
-    if self.image_type == "local":
+    if self.image_type == 'local':
       chromeos_image = os.path.expanduser(chromeos_image)
 
     self.name = name
@@ -35,11 +44,11 @@ class Label(object):
     self.cache_dir = cache_dir
     self.cache_only = cache_only
     self.log_level = log_level
-    self.chrome_version = ""
+    self.chrome_version = ''
     self.compiler = compiler
 
     if not chromeos_root:
-      if self.image_type == "local":
+      if self.image_type == 'local':
         chromeos_root = FileUtils().ChromeOSRootFromImage(chromeos_image)
       if not chromeos_root:
         raise Exception("No ChromeOS root given for label '%s' and could not "
@@ -48,22 +57,21 @@ class Label(object):
     else:
       chromeos_root = FileUtils().CanonicalizeChromeOSRoot(chromeos_root)
       if not chromeos_root:
-        raise Exception("Invalid ChromeOS root given for label '%s': '%s'."
-                        % (name, chromeos_root))
+        raise Exception("Invalid ChromeOS root given for label '%s': '%s'." %
+                        (name, chromeos_root))
 
     self.chromeos_root = chromeos_root
     if not chrome_src:
       self.chrome_src = os.path.join(
-          self.chromeos_root,
-          ".cache/distfiles/target/chrome-src-internal")
+          self.chromeos_root, '.cache/distfiles/target/chrome-src-internal')
       if not os.path.exists(self.chrome_src):
         self.chrome_src = os.path.join(self.chromeos_root,
-                                       ".cache/distfiles/target/chrome-src")
+                                       '.cache/distfiles/target/chrome-src')
     else:
       chromeos_src = misc.CanonicalizePath(chrome_src)
       if not chromeos_src:
-        raise Exception("Invalid Chrome src given for label '%s': '%s'."
-                        % (name, chrome_src))
+        raise Exception("Invalid Chrome src given for label '%s': '%s'." %
+                        (name, chrome_src))
       self.chrome_src = chromeos_src
 
     self._SetupChecksum()
@@ -72,19 +80,19 @@ class Label(object):
     """Compute label checksum only once."""
 
     self.checksum = None
-    if self.image_type == "local":
+    if self.image_type == 'local':
       self.checksum = ImageChecksummer().Checksum(self, self.log_level)
-    elif self.image_type == "trybot":
+    elif self.image_type == 'trybot':
       self.checksum = hashlib.md5(self.chromeos_image).hexdigest()
 
   def _GetImageType(self, chromeos_image):
     image_type = None
-    if chromeos_image.find("xbuddy://") < 0:
-      image_type = "local"
-    elif chromeos_image.find("trybot") >= 0:
-      image_type = "trybot"
+    if chromeos_image.find('xbuddy://') < 0:
+      image_type = 'local'
+    elif chromeos_image.find('trybot') >= 0:
+      image_type = 'trybot'
     else:
-      image_type = "official"
+      image_type = 'official'
     return image_type
 
   def __hash__(self):
@@ -102,10 +110,21 @@ class Label(object):
 
     return 'label[name="{}"]'.format(self.name)
 
+
 class MockLabel(object):
   """The mock label class."""
-  def __init__(self, name, chromeos_image, chromeos_root, board, remote,
-               image_args, cache_dir, cache_only, log_level, compiler,
+
+  def __init__(self,
+               name,
+               chromeos_image,
+               chromeos_root,
+               board,
+               remote,
+               image_args,
+               cache_dir,
+               cache_only,
+               log_level,
+               compiler,
                chrome_src=None):
     self.name = name
     self.chromeos_image = chromeos_image
@@ -114,7 +133,7 @@ class MockLabel(object):
     self.cache_dir = cache_dir
     self.cache_only = cache_only
     if not chromeos_root:
-      self.chromeos_root = "/tmp/chromeos_root"
+      self.chromeos_root = '/tmp/chromeos_root'
     else:
       self.chromeos_root = chromeos_root
     self.image_args = image_args
@@ -123,14 +142,14 @@ class MockLabel(object):
     self.checksum = ''
     self.log_level = log_level
     self.compiler = compiler
-    self.chrome_version = "Fake Chrome Version 50"
+    self.chrome_version = 'Fake Chrome Version 50'
 
   def _GetImageType(self, chromeos_image):
     image_type = None
-    if chromeos_image.find("xbuddy://") < 0:
-      image_type = "local"
-    elif chromeos_image.find("trybot") >= 0:
-      image_type = "trybot"
+    if chromeos_image.find('xbuddy://') < 0:
+      image_type = 'local'
+    elif chromeos_image.find('trybot') >= 0:
+      image_type = 'trybot'
     else:
-      image_type = "official"
+      image_type = 'official'
     return image_type