Fix more pylint warnings.
BUG=none
TEST=All modified files are pylint clean. All unit tests pass.
Change-Id: I0a85ea2360cca776dd3ec60a8bcc11cdf791e776
Reviewed-on: https://gerrit.chromium.org/gerrit/39716
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Ryan Cui <rcui@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 9964dfd..d09516b 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -14,7 +14,6 @@
import errno
import glob
import logging
-import multiprocessing
import optparse
import os
import pprint
diff --git a/scripts/chrome_set_ver.py b/scripts/chrome_set_ver.py
index a0879e8..8802d78 100644
--- a/scripts/chrome_set_ver.py
+++ b/scripts/chrome_set_ver.py
@@ -52,11 +52,11 @@
return self._local_scope['vars'][var_name]
raise Exception('Var is not defined: %s' % var_name)
- locals = {}
- var = _VarImpl({}, locals)
- globals = {'From': FromImpl, 'Var': var.Lookup, 'deps_os': {}}
- exec(deps_content) in globals, locals
- return locals
+ my_locals = {}
+ var = _VarImpl({}, my_locals)
+ my_globals = {'From': FromImpl, 'Var': var.Lookup, 'deps_os': {}}
+ exec(deps_content) in my_globals, my_locals
+ return my_locals
def _CreateCrosSymlink(repo_root):
diff --git a/scripts/cros_enable_push.py b/scripts/cros_enable_push.py
index e4f447c..e4954e3 100644
--- a/scripts/cros_enable_push.py
+++ b/scripts/cros_enable_push.py
@@ -12,10 +12,10 @@
def _Usage(handle):
- print >>handle, (
+ print >> handle, (
"Tool to fix git configuration and add push configuration to a repo.")
- print >>handle
- print >>handle, (
+ print >> handle
+ print >> handle, (
"""Fix git configuration, and enable git pushing to the remote.
To run this script, either invoke it from within a repo checkout, or pass it
@@ -39,7 +39,7 @@
path = git.FindRepoCheckoutRoot()
if path is None:
_Usage(sys.stderr)
- print >>sys.stderr, "We're not in a repo checkout."
+ print >> sys.stderr, "We're not in a repo checkout."
return 1
else:
if argv[0] in ('-h', '--help', '--usage'):
@@ -48,7 +48,7 @@
path = argv[0]
if not repository.IsARepoRoot(path):
_Usage(sys.stderr)
- print >>sys.stderr, ("Path %s doesn't point to the root of a repository."
+ print >> sys.stderr, ("Path %s doesn't point to the root of a repository."
% (argv[0],))
return 1
diff --git a/scripts/cros_env_whitelist.py b/scripts/cros_env_whitelist.py
index 5f6890f..21382b7 100644
--- a/scripts/cros_env_whitelist.py
+++ b/scripts/cros_env_whitelist.py
@@ -9,5 +9,5 @@
from chromite.buildbot import constants
-def main(argv):
+def main(_argv):
print ' '.join(constants.CHROOT_ENVIRONMENT_WHITELIST)
diff --git a/scripts/cros_generate_local_binhosts.py b/scripts/cros_generate_local_binhosts.py
index 9f014b2..bb014d9 100644
--- a/scripts/cros_generate_local_binhosts.py
+++ b/scripts/cros_generate_local_binhosts.py
@@ -73,7 +73,7 @@
by_compatibility[compat_id].add(other_board)
if compatible_boards is None:
- print >>sys.stderr, "Missing portageq wrapper for %s" % flags.board
+ print >> sys.stderr, "Missing portageq wrapper for %s" % flags.board
sys.exit(1)
# If a non-generic prebuilt is available, ignore the generic ones,
diff --git a/scripts/merge_package_status.py b/scripts/merge_package_status.py
index 751dc16..a675a68 100644
--- a/scripts/merge_package_status.py
+++ b/scripts/merge_package_status.py
@@ -10,7 +10,6 @@
import optparse
import os
import re
-import sys
from chromite.lib import operation
from chromite.lib import table
diff --git a/scripts/merge_package_status_unittest.py b/scripts/merge_package_status_unittest.py
index fa94978..23cd2b2 100644
--- a/scripts/merge_package_status_unittest.py
+++ b/scripts/merge_package_status_unittest.py
@@ -9,8 +9,6 @@
import exceptions
import mox
import os
-import re
-import sys
import tempfile
from chromite.lib import cros_test_lib
diff --git a/scripts/upload_package_status.py b/scripts/upload_package_status.py
index 762d2e2..e614962 100644
--- a/scripts/upload_package_status.py
+++ b/scripts/upload_package_status.py
@@ -7,7 +7,6 @@
import optparse
import os
-import sys
from chromite.lib import gdata_lib
from chromite.lib import table
@@ -296,6 +295,3 @@
# write auth_token out to that location.
if options.token_file:
creds.StoreAuthTokenIfNeeded(options.token_file)
-
-if __name__ == '__main__':
- main()