commit 1a8a7f91acc5164d93743e4435dcdd807beafaee
author Achuith Bhandarkar <achuith@chromium.org> Thu Sep 26 15:35:23 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Sep 30 21:07:18 2019 +0000
tree ef815e964c5429797df247f8274a39bc6714ef43
parent 225f26e0ec30572e35c487a3c840d466ffe52945

common_util: Fix lint errors.

BUG=chromium:403086
TEST=unittests

Change-Id: Ifddfcde6308f6241627293383cd31c01f07f01e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1827366
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Sean Abraham <seanabraham@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Sean Abraham <seanabraham@chromium.org>

common_util.py

diff --git a/common_util.py b/common_util.py
index c2a9287..a1494a0 100644
--- a/common_util.py
+++ b/common_util.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2012 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.
@@ -9,8 +10,7 @@
 import ast
 import base64
 import binascii
-import cherrypy
-import distutils.version
+import distutils.version  # pylint: disable=no-name-in-module,import-error
 import errno
 import hashlib
 import os
@@ -20,6 +20,8 @@
 import threading
 import subprocess
 
+import cherrypy  # pylint: disable=import-error
+
 import log_util
 
 
@@ -101,7 +103,7 @@
 
   if milestone and builds:
     # Check if milestone Rxx is in the string representation of the build.
-    builds = filter(lambda x: milestone.upper() in str(x), builds)
+    builds = [build for build in builds if milestone.upper() in str(build)]
 
   if not builds:
     raise CommonUtilError('Could not determine build for %s' % target)
@@ -315,7 +317,7 @@
     # directory as the required |link| to ensure the created symlink is in the
     # same file system as |link|.
     link_name = os.path.join(os.path.dirname(link),
-                             os.path.basename(link_base) + "-link")
+                             os.path.basename(link_base) + '-link')
 
     # Create the symlink and then rename it to the final position. This ensures
     # the symlink creation is atomic.
@@ -430,10 +432,7 @@
            cmd_error.rstrip())
       return False
 
-    if re.search(r"[_-]+moblab", cmd_output):
-      return True
-    else:
-      return False
+    return bool(re.search(r'[_-]+moblab', cmd_output))
   except subprocess.CalledProcessError as e:
     _Log('Error happened while checking whether devserver package is running '
          'on a DUT: %s\n%s', e, e.output)