From 2d20600a7f690346d227281bb815b32e9b16c6c8 Mon Sep 17 00:00:00 2001
From: Aki Sasaki <aki@escapewindow.com>
Date: Tue, 2 Feb 2016 10:31:06 -0500
Subject: [PATCH] bug 1244781 - silence mozharness pyflakes warnings. r=jlund

--HG--
extra : histedit_source : cc1544eed4bd617bba4c99bfcccff45dbe414fd3
---
 testing/mozharness/mozharness/base/vcs/tcvcs.py            | 3 +--
 .../mozharness/mozharness/mozilla/building/buildbase.py    | 1 -
 testing/mozharness/mozharness/mozilla/gaia.py              | 3 ++-
 testing/mozharness/mozharness/mozilla/selfserve.py         | 1 -
 .../mozharness/mozilla/testing/firefox_media_tests.py      | 1 -
 testing/mozharness/mozharness/mozilla/testing/gaia_test.py | 2 --
 testing/mozharness/mozharness/mozilla/testing/talos.py     | 5 ++---
 testing/mozharness/mozharness/mozilla/tooltool.py          | 2 --
 testing/mozharness/mozharness/mozilla/vcstools.py          | 3 ---
 testing/mozharness/scripts/android_emulator_unittest.py    | 7 ++-----
 testing/mozharness/scripts/android_panda_talos.py          | 1 -
 testing/mozharness/scripts/androidx86_emulator_unittest.py | 3 ---
 testing/mozharness/scripts/b2g_build.py                    | 2 +-
 testing/mozharness/scripts/b2g_desktop_unittest.py         | 2 +-
 testing/mozharness/scripts/b2g_emulator_unittest.py        | 2 +-
 testing/mozharness/scripts/desktop_partner_repacks.py      | 2 +-
 testing/mozharness/scripts/desktop_unittest.py             | 4 +---
 testing/mozharness/scripts/firefox_media_tests_jenkins.py  | 3 ---
 testing/mozharness/scripts/luciddream_unittest.py          | 4 ++--
 testing/mozharness/scripts/marionette.py                   | 4 ++--
 testing/mozharness/scripts/mobile_l10n.py                  | 4 ++--
 testing/mozharness/scripts/update_apk_description.py       | 2 +-
 22 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/testing/mozharness/mozharness/base/vcs/tcvcs.py b/testing/mozharness/mozharness/base/vcs/tcvcs.py
index d265bf022175..55fca4afd82a 100644
--- a/testing/mozharness/mozharness/base/vcs/tcvcs.py
+++ b/testing/mozharness/mozharness/base/vcs/tcvcs.py
@@ -1,7 +1,6 @@
 import os.path
 from mozharness.base.script import ScriptMixin
-from mozharness.base.log import LogMixin, OutputParser
-from mozharness.base.errors import VCSException
+from mozharness.base.log import LogMixin
 
 class TcVCS(ScriptMixin, LogMixin):
     def __init__(self, log_obj=None, config=None, vcs_config=None,
diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py
index afbfddfadf39..1088007a49b0 100755
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -2056,7 +2056,6 @@ or run without that action (ie: --no-{action})"
 
     def update(self):
         """ submit balrog update steps. """
-        c = self.config
         if not self.query_is_nightly():
             self.info("Not a nightly build, skipping balrog submission.")
             return
diff --git a/testing/mozharness/mozharness/mozilla/gaia.py b/testing/mozharness/mozharness/mozilla/gaia.py
index e7696b20a54c..279912d6f393 100644
--- a/testing/mozharness/mozharness/mozilla/gaia.py
+++ b/testing/mozharness/mozharness/mozilla/gaia.py
@@ -6,7 +6,8 @@ import json
 import os
 import re
 
-from mozharness.base.errors import HgErrorList, BaseErrorList, ZipErrorList
+from mozharness.base.errors import HgErrorList, BaseErrorList, TarErrorList, \
+    ZipErrorList
 from mozharness.base.log import ERROR, FATAL
 
 gaia_config_options = [
diff --git a/testing/mozharness/mozharness/mozilla/selfserve.py b/testing/mozharness/mozharness/mozilla/selfserve.py
index 08a822e4f300..69e243059b1d 100644
--- a/testing/mozharness/mozharness/mozilla/selfserve.py
+++ b/testing/mozharness/mozharness/mozilla/selfserve.py
@@ -1,5 +1,4 @@
 import json
-import os
 import site
 
 # SelfServeMixin {{{1
diff --git a/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py b/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
index c97bcfb3476b..6ae80c7c2d9d 100644
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
@@ -6,7 +6,6 @@
 # ***** BEGIN LICENSE BLOCK *****
 
 import copy
-import glob
 import os
 import re
 import urlparse
diff --git a/testing/mozharness/mozharness/mozilla/testing/gaia_test.py b/testing/mozharness/mozharness/mozilla/testing/gaia_test.py
index adc0837e158c..dfb87011a416 100644
--- a/testing/mozharness/mozharness/mozilla/testing/gaia_test.py
+++ b/testing/mozharness/mozharness/mozilla/testing/gaia_test.py
@@ -6,14 +6,12 @@
 
 import copy
 import os
-import re
 import sys
 import time
 
 # load modules from parent dir
 sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
 
-from mozharness.base.errors import TarErrorList, ZipErrorList
 from mozharness.base.log import INFO, ERROR, WARNING, FATAL
 from mozharness.base.script import PreScriptAction
 from mozharness.base.transfer import TransferMixin
diff --git a/testing/mozharness/mozharness/mozilla/testing/talos.py b/testing/mozharness/mozharness/mozilla/testing/talos.py
index 0a16c9bc135c..0cd3930cfb7b 100755
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -16,10 +16,10 @@ import json
 
 from mozharness.base.config import parse_config_file
 from mozharness.base.errors import PythonErrorList
-from mozharness.base.log import OutputParser, DEBUG, ERROR, CRITICAL, FATAL
+from mozharness.base.log import OutputParser, DEBUG, ERROR, CRITICAL
 from mozharness.base.log import INFO, WARNING
 from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
-from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options, INSTALLER_SUFFIXES
+from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
 from mozharness.base.vcs.vcsbase import MercurialScript
 from mozharness.mozilla.testing.errors import TinderBoxPrintRe
 from mozharness.mozilla.buildbot import TBPL_SUCCESS, TBPL_WORST_LEVEL_TUPLE
@@ -192,7 +192,6 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
         return sps_results
 
     def query_abs_dirs(self):
-        c = self.config
         if self.abs_dirs:
             return self.abs_dirs
         abs_dirs = super(Talos, self).query_abs_dirs()
diff --git a/testing/mozharness/mozharness/mozilla/tooltool.py b/testing/mozharness/mozharness/mozilla/tooltool.py
index b48d0a10ac38..bcdb7eb4f78a 100644
--- a/testing/mozharness/mozharness/mozilla/tooltool.py
+++ b/testing/mozharness/mozharness/mozilla/tooltool.py
@@ -6,8 +6,6 @@ from mozharness.base.errors import PythonErrorList
 from mozharness.base.log import ERROR, FATAL
 from mozharness.mozilla.proxxy import Proxxy
 
-from mozharness.lib.python.authentication import get_credentials_path
-
 TooltoolErrorList = PythonErrorList + [{
     'substr': 'ERROR - ', 'level': ERROR
 }]
diff --git a/testing/mozharness/mozharness/mozilla/vcstools.py b/testing/mozharness/mozharness/mozilla/vcstools.py
index 927617bed31b..730b8ec5921f 100644
--- a/testing/mozharness/mozharness/mozilla/vcstools.py
+++ b/testing/mozharness/mozharness/mozilla/vcstools.py
@@ -9,7 +9,6 @@
 Author: Armen Zambrano G.
 """
 import os
-import stat
 
 from mozharness.base.script import PreScriptAction
 from mozharness.base.vcs.vcsbase import VCSScript
@@ -23,8 +22,6 @@ class VCSToolsScript(VCSScript):
     '''
     @PreScriptAction('checkout')
     def _pre_checkout(self, action):
-        dirs = self.query_abs_dirs()
-
         if self.config.get('developer_mode'):
             # We put them on base_work_dir to prevent the clobber action
             # to delete them before we use them
diff --git a/testing/mozharness/scripts/android_emulator_unittest.py b/testing/mozharness/scripts/android_emulator_unittest.py
index 09eed8e58db8..7340989775e8 100644
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -22,7 +22,7 @@ sys.path.insert(1, os.path.dirname(sys.path[0]))
 from mozprocess import ProcessHandler
 
 from mozharness.base.log import FATAL
-from mozharness.base.script import BaseScript, PostScriptRun
+from mozharness.base.script import BaseScript
 from mozharness.base.vcs.vcsbase import VCSMixin
 from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
 from mozharness.mozilla.mozbase import MozbaseMixin
@@ -698,10 +698,7 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
             config=self.config,
             log_obj=self.log_obj,
             error_list=self.error_list)
-        return_code = self.run_command(cmd,
-                                       cwd=cwd,
-                                       env=env,
-                                       output_parser=parser)
+        self.run_command(cmd, cwd=cwd, env=env, output_parser=parser)
         tbpl_status, log_level = parser.evaluate_parser(0)
         parser.append_tinderboxprint_line(self.test_suite)
 
diff --git a/testing/mozharness/scripts/android_panda_talos.py b/testing/mozharness/scripts/android_panda_talos.py
index 3961d3e7aae2..a33986f4ad2b 100644
--- a/testing/mozharness/scripts/android_panda_talos.py
+++ b/testing/mozharness/scripts/android_panda_talos.py
@@ -197,7 +197,6 @@ class PandaTalosTest(TestingMixin, MercurialScript, BlobUploadMixin, MozpoolMixi
                 dirs = self.query_abs_dirs()
                 abs_base_cmd = self._query_abs_base_cmd(suite_category)
                 cmd = abs_base_cmd[:]
-                tbpl_status, log_level = None, None
                 c = self.config
                 if c.get('minidump_stackwalk_path'):
                     env['MINIDUMP_STACKWALK'] = c['minidump_stackwalk_path']
diff --git a/testing/mozharness/scripts/androidx86_emulator_unittest.py b/testing/mozharness/scripts/androidx86_emulator_unittest.py
index 1d76edcb283e..41fbd26d97b7 100644
--- a/testing/mozharness/scripts/androidx86_emulator_unittest.py
+++ b/testing/mozharness/scripts/androidx86_emulator_unittest.py
@@ -29,8 +29,6 @@ from mozharness.mozilla.buildbot import TBPL_WORST_LEVEL_TUPLE
 from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
 from mozharness.mozilla.testing.unittest import EmulatorMixin
 
-from mozharness.mozilla.testing.device import ADBDeviceHandler
-
 
 class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin, BaseScript, MozbaseMixin):
     config_options = [[
@@ -477,7 +475,6 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
          - the stdout where the output is going to
          - the suite name that is associated
         """
-        dirs = self.query_abs_dirs()
         cmd = self._build_command(self.emulators[emulator_index], suite_name)
 
         try:
diff --git a/testing/mozharness/scripts/b2g_build.py b/testing/mozharness/scripts/b2g_build.py
index 80e11163d2db..d685f08adb67 100755
--- a/testing/mozharness/scripts/b2g_build.py
+++ b/testing/mozharness/scripts/b2g_build.py
@@ -26,7 +26,7 @@ sys.path.insert(1, os.path.dirname(sys.path[0]))
 
 # import the guts
 from mozharness.base.config import parse_config_file
-from mozharness.base.log import WARNING, ERROR, FATAL
+from mozharness.base.log import WARNING, FATAL
 from mozharness.mozilla.l10n.locales import GaiaLocalesMixin, LocalesMixin
 from mozharness.mozilla.purge import PurgeMixin
 from mozharness.mozilla.signing import SigningMixin
diff --git a/testing/mozharness/scripts/b2g_desktop_unittest.py b/testing/mozharness/scripts/b2g_desktop_unittest.py
index af7a1d2c8767..2c81beb9cdc5 100755
--- a/testing/mozharness/scripts/b2g_desktop_unittest.py
+++ b/testing/mozharness/scripts/b2g_desktop_unittest.py
@@ -12,7 +12,7 @@ import sys
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
 from mozharness.base.errors import BaseErrorList
-from mozharness.base.log import ERROR, WARNING
+from mozharness.base.log import ERROR
 from mozharness.base.script import PreScriptAction
 from mozharness.base.vcs.vcsbase import MercurialScript
 from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
diff --git a/testing/mozharness/scripts/b2g_emulator_unittest.py b/testing/mozharness/scripts/b2g_emulator_unittest.py
index 1e9789679e84..cced5c06ed78 100755
--- a/testing/mozharness/scripts/b2g_emulator_unittest.py
+++ b/testing/mozharness/scripts/b2g_emulator_unittest.py
@@ -14,7 +14,7 @@ import sys
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
 from mozharness.base.errors import BaseErrorList, TarErrorList
-from mozharness.base.log import ERROR, WARNING
+from mozharness.base.log import ERROR
 from mozharness.base.script import (
     BaseScript,
     PreScriptAction,
diff --git a/testing/mozharness/scripts/desktop_partner_repacks.py b/testing/mozharness/scripts/desktop_partner_repacks.py
index 54c95d469947..9cf66a066154 100755
--- a/testing/mozharness/scripts/desktop_partner_repacks.py
+++ b/testing/mozharness/scripts/desktop_partner_repacks.py
@@ -19,7 +19,7 @@ from mozharness.mozilla.buildbot import BuildbotMixin
 from mozharness.mozilla.purge import PurgeMixin
 from mozharness.mozilla.release import ReleaseMixin
 from mozharness.base.python import VirtualenvMixin
-from mozharness.base.log import ERROR, FATAL
+from mozharness.base.log import FATAL
 
 try:
     import simplejson as json
diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py
index c328fd619eff..adaa88b19f23 100755
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -21,7 +21,7 @@ import glob
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
 from mozharness.base.errors import BaseErrorList
-from mozharness.base.log import INFO, ERROR, WARNING
+from mozharness.base.log import INFO, ERROR
 from mozharness.base.script import PreScriptAction
 from mozharness.base.vcs.vcsbase import MercurialScript
 from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
@@ -566,7 +566,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
                       os.path.join(abs_app_dir))
 
     def preflight_mozmill(self, suites):
-        c = self.config
         dirs = self.query_abs_dirs()
         abs_app_dir = self.query_abs_app_dir()
         abs_app_plugins_dir = os.path.join(abs_app_dir, 'plugins')
@@ -588,7 +587,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
 
     def _run_category_suites(self, suite_category, preflight_run_method=None):
         """run suite(s) to a specific category"""
-        c = self.config
         dirs = self.query_abs_dirs()
         suites = self._query_specified_suites(suite_category)
         abs_app_dir = self.query_abs_app_dir()
diff --git a/testing/mozharness/scripts/firefox_media_tests_jenkins.py b/testing/mozharness/scripts/firefox_media_tests_jenkins.py
index 2b887a619ba4..e35655257af2 100755
--- a/testing/mozharness/scripts/firefox_media_tests_jenkins.py
+++ b/testing/mozharness/scripts/firefox_media_tests_jenkins.py
@@ -8,14 +8,11 @@
 
 Author: Syd Polk
 """
-import copy
-import glob
 import os
 import sys
 
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
-from mozharness.base.script import PreScriptAction
 from mozharness.mozilla.testing.firefox_media_tests import (
     FirefoxMediaTestsBase
 )
diff --git a/testing/mozharness/scripts/luciddream_unittest.py b/testing/mozharness/scripts/luciddream_unittest.py
index eb2ce226364d..639a35b63bbb 100644
--- a/testing/mozharness/scripts/luciddream_unittest.py
+++ b/testing/mozharness/scripts/luciddream_unittest.py
@@ -12,8 +12,8 @@ import sys
 # load modules from parent dir
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
-from mozharness.base.errors import BaseErrorList, TarErrorList, ZipErrorList
-from mozharness.base.log import ERROR, WARNING, FATAL, INFO
+from mozharness.base.errors import BaseErrorList, TarErrorList
+from mozharness.base.log import ERROR, FATAL, INFO
 from mozharness.base.script import (
     BaseScript,
     PreScriptAction,
diff --git a/testing/mozharness/scripts/marionette.py b/testing/mozharness/scripts/marionette.py
index 199deb1ea0ee..eae909a1da41 100755
--- a/testing/mozharness/scripts/marionette.py
+++ b/testing/mozharness/scripts/marionette.py
@@ -13,8 +13,8 @@ import sys
 # load modules from parent dir
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
-from mozharness.base.errors import TarErrorList, ZipErrorList
-from mozharness.base.log import INFO, ERROR, WARNING, FATAL
+from mozharness.base.errors import TarErrorList
+from mozharness.base.log import INFO, ERROR, WARNING
 from mozharness.base.script import PreScriptAction
 from mozharness.base.transfer import TransferMixin
 from mozharness.base.vcs.vcsbase import MercurialScript
diff --git a/testing/mozharness/scripts/mobile_l10n.py b/testing/mozharness/scripts/mobile_l10n.py
index 98cb2786df0e..ced9d50080bb 100755
--- a/testing/mozharness/scripts/mobile_l10n.py
+++ b/testing/mozharness/scripts/mobile_l10n.py
@@ -490,8 +490,8 @@ class MobileSingleLocale(MockMixin, LocalesMixin, ReleaseMixin,
         pushdate = time.strftime('%Y%m%d%H%M%S', time.gmtime(pushinfo.pushdate))
         routes_json = os.path.join(self.query_abs_dirs()['abs_mozilla_dir'],
                                    'testing/taskcluster/routes.json')
-        with open(routes_json) as f:
-            contents = json.load(f)
+        with open(routes_json) as routes_file:
+            contents = json.load(routes_file)
             templates = contents['l10n']
 
         for locale in locales:
diff --git a/testing/mozharness/scripts/update_apk_description.py b/testing/mozharness/scripts/update_apk_description.py
index 0fe2fb66ca67..721ce94abb28 100644
--- a/testing/mozharness/scripts/update_apk_description.py
+++ b/testing/mozharness/scripts/update_apk_description.py
@@ -185,7 +185,7 @@ class UpdateDescriptionAPK(BaseScript, GooglePlayMixin, VirtualenvMixin):
                          "' /  title: '" + title + "', short_desc: '" +
                          short_desc[0:20] + "'..., long_desc: '" +
                          long_desc[0:20] + "...'")
-                listing_response = service.edits().listings().update(
+                service.edits().listings().update(
                     editId=edit_id, packageName=package_name, language=locale,
                     body={'fullDescription': long_desc,
                           'shortDescription': short_desc,