commit 8658343c696efaf1ca55f4f2dd18324c55c67155
author Amin Hassani <ahassani@chromium.org> Thu Oct 03 10:45:45 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Oct 08 00:17:51 2019 +0000
tree 3abcdcc3c07266313a733c00441072d5bf7397ac
parent 4f1e462a1e41010d9a0fd9464974fc0ca4522f54

cros_update: Fix linter errors

BUG=chromium:1003986
TEST=./cros_update_unittest.py
TEST=./devserver_integration_test.py

Change-Id: Iccc9ee6d8f083563e1a17d167791af4cc237ca53
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1838132
Tested-by: Amin Hassani <ahassani@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

cros_update.py

diff --git a/cros_update.py b/cros_update.py
index 2025e4c..479f82d 100644
--- a/cros_update.py
+++ b/cros_update.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2016 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.
@@ -24,17 +25,18 @@
 from __future__ import print_function
 
 import argparse
-import cros_update_logging
-import cros_update_progress
-import logging # pylint: disable=cros-logging-import
 import os
 import re
 import sys
 import time
 import traceback
+import logging  # pylint: disable=cros-logging-import
+
+import cros_update_logging
+import cros_update_progress
 
 # only import setup_chromite before chromite import.
-import setup_chromite # pylint: disable=unused-import
+import setup_chromite  # pylint: disable=unused-import
 try:
   from chromite.lib import auto_updater
   from chromite.lib import cros_build_lib
@@ -249,7 +251,7 @@
     key_re = re.compile(r'^KEYVAL: ([^\d\W]\w*)=(.*)$')
     matches = [key_re.match(l) for l in results.output.splitlines()]
     keyvals = {m.group(1): m.group(2) for m in matches if m}
-    logging.info("DUT returned keyvals: %s", keyvals)
+    logging.info('DUT returned keyvals: %s', keyvals)
 
     # If there was an SSH error, check the keyvals to see if it actually
     # completed and suppress the error if so.

cros_update_logging.py

diff --git a/cros_update_logging.py b/cros_update_logging.py
index b1fca8c..9cc6dd8 100644
--- a/cros_update_logging.py
+++ b/cros_update_logging.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2016 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.
@@ -13,7 +14,7 @@
 
 from __future__ import print_function
 
-import logging
+import logging  # pylint: disable=cros-logging-import
 import sys
 
 

cros_update_progress.py

diff --git a/cros_update_progress.py b/cros_update_progress.py
index c337e0a..9bcb906 100644
--- a/cros_update_progress.py
+++ b/cros_update_progress.py
@@ -1,4 +1,5 @@
-# Copyright (c) 2016 The Chromium OS Authors. All rights reserved.
+# -*- coding: utf-8 -*-
+# Copyright 2016 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.
 
@@ -22,24 +23,23 @@
 
 import datetime
 import glob
-import logging
+import logging  # pylint: disable=cros-logging-import
 import os
 import re
 
 import log_util
 
-# Module-local log function.
-def _Log(message, *args):
-  return log_util.LogWithTag('CROS_UPDATE_PROGRESS', message, *args)
-
 # only import setup_chromite before chromite import.
-import setup_chromite # pylint: disable=unused-import
+import setup_chromite  # pylint: disable=unused-import
 try:
   from chromite.lib import osutils
 except ImportError as e:
   _Log('chromite cannot be imported: %r', e)
   osutils = None
 
+# Module-local log function.
+def _Log(message, *args):
+  return log_util.LogWithTag('CROS_UPDATE_PROGRESS', message, *args)
 
 # Path for status tracking log.
 _TRACK_LOG_FILE_PATH = '/tmp/auto-update/tracking_log/%s_%s.log'