AW: remove pylint import-error suppressions

No change to logic. We can clean up most pylint import-error
suppressions because https://crrev.com/c/1988588 added paths to
extra_paths_list.

Test: git cl presubmit --upload
Change-Id: I74ed26ff7fa20c9181ac05808cbd42c615065263
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992688
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Auto-Submit: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729541}

android_webview/tools/PRESUBMIT.py

@@ -19,14 +19,21 @@ def CommonChecks(input_api, output_api):
   checks = []
 
   src_root = input_api.os_path.join(input_api.PresubmitLocalPath(), '..', '..')
-  checks.extend(input_api.canned_checks.GetPylint(
-      input_api, output_api, pylintrc='pylintrc',
-      # Allows pylint to find //build/android and //third_party/catapult/devil,
-      # which some of the scripts in this directory import.
-      extra_paths_list=[
-          input_api.os_path.join(src_root, 'build', 'android'),
-          input_api.os_path.join(src_root, 'third_party', 'catapult', 'devil'),
-      ]))
+  checks.extend(
+      input_api.canned_checks.GetPylint(
+          input_api,
+          output_api,
+          pylintrc='pylintrc',
+          # Allows pylint to find dependencies imported by scripts in this
+          # directory.
+          extra_paths_list=[
+              input_api.os_path.join(src_root, 'build', 'android'),
+              input_api.os_path.join(src_root, 'build', 'android', 'gyp'),
+              input_api.os_path.join(src_root, 'third_party', 'catapult',
+                                     'common', 'py_utils'),
+              input_api.os_path.join(src_root, 'third_party', 'catapult',
+                                     'devil'),
+          ]))
   checks.extend(_GetPythonUnitTests(input_api, output_api))
   return input_api.RunTests(checks, False)
 

android_webview/tools/apk_merger.py

@@ -48,12 +48,12 @@ BUILD_ANDROID_DIR = os.path.join(SRC_DIR, 'build', 'android')
 BUILD_ANDROID_GYP_DIR = os.path.join(BUILD_ANDROID_DIR, 'gyp')
 sys.path.append(BUILD_ANDROID_GYP_DIR)
 
-import finalize_apk # pylint: disable=import-error,wrong-import-position
-from util import build_utils # pylint: disable=import-error,wrong-import-position
+import finalize_apk  # pylint: disable=wrong-import-position
+from util import build_utils  # pylint: disable=wrong-import-position
 
 sys.path.append(BUILD_ANDROID_DIR)
 
-from pylib import constants  # pylint: disable=import-error,wrong-import-position
+from pylib import constants  # pylint: disable=wrong-import-position
 
 DEFAULT_ZIPALIGN_PATH = os.path.join(
     SRC_DIR, 'third_party', 'android_sdk', 'public', 'build-tools',
@@ -254,9 +254,11 @@ def main():
 
     apksigner_jar = os.path.join(
         os.path.dirname(args.zipalign_path), 'lib', 'apksigner.jar')
-    finalize_apk.FinalizeApk(apksigner_jar, args.zipalign_path,
-                             tmp_apk, new_apk, args.keystore_path,
-                             args.key_password, args.key_name)
+    # TODO(https://crbug.com/1040240): remove the pylint suppression and pass
+    # the right value
+    finalize_apk.FinalizeApk(  # pylint: disable=no-value-for-parameter
+        apksigner_jar, args.zipalign_path, tmp_apk, new_apk, args.keystore_path,
+        args.key_password, args.key_name)
   finally:
     shutil.rmtree(tmp_dir)
   return 0

android_webview/tools/record_netlog.py

@@ -21,12 +21,12 @@ import time
 sys.path.append(
     os.path.join(
         os.path.dirname(__file__), os.pardir, os.pardir, 'build', 'android'))
-import devil_chromium  # pylint: disable=import-error
-from devil.android import device_errors  # pylint: disable=import-error
-from devil.android import flag_changer  # pylint: disable=import-error
-from devil.android import device_utils  # pylint: disable=import-error
-from devil.android.tools import script_common  # pylint: disable=import-error
-from devil.utils import logging_common  # pylint: disable=import-error
+import devil_chromium
+from devil.android import device_errors
+from devil.android import flag_changer
+from devil.android import device_utils
+from devil.android.tools import script_common
+from devil.utils import logging_common
 
 WEBVIEW_COMMAND_LINE = 'webview-command-line'
 

android_webview/tools/remove_preinstalled_webview.py

@@ -36,13 +36,13 @@ import sys
 
 sys.path.append(os.path.join(
     os.path.dirname(__file__), os.pardir, os.pardir, 'build', 'android'))
-import devil_chromium  # pylint: disable=import-error
-from devil.android import device_errors  # pylint: disable=import-error
-from devil.android import device_utils  # pylint: disable=import-error
-from devil.android.sdk import keyevent  # pylint: disable=import-error
-from devil.android.tools import script_common  # pylint: disable=import-error
-from devil.android.tools import system_app  # pylint: disable=import-error
-from devil.utils import logging_common  # pylint: disable=import-error
+import devil_chromium
+from devil.android import device_errors
+from devil.android import device_utils
+from devil.android.sdk import keyevent
+from devil.android.tools import script_common
+from devil.android.tools import system_app
+from devil.utils import logging_common
 
 WEBVIEW_PACKAGES = ['com.android.webview', 'com.google.android.webview']
 

android_webview/tools/run_cts_test.py

@@ -13,9 +13,10 @@ import run_cts
 
 sys.path.append(os.path.join(
     os.path.dirname(__file__), os.pardir, os.pardir, 'build', 'android'))
-import devil_chromium  # pylint: disable=import-error, unused-import
-from devil.android.ndk import abis  # pylint: disable=import-error
-from devil.android.sdk import version_codes  # pylint: disable=import-error
+import devil_chromium  # pylint: disable=unused-import
+from devil.android.ndk import abis
+from devil.android.sdk import version_codes
+
 
 class _RunCtsTest(unittest.TestCase):
   """Unittests for the run_cts module.

android_webview/tools/run_simpleperf.py

@@ -22,13 +22,13 @@ import sys
 
 sys.path.append(os.path.join(
     os.path.dirname(__file__), os.pardir, os.pardir, 'build', 'android'))
-import devil_chromium  # pylint: disable=import-error
-from devil.android import apk_helper # pylint: disable=import-error
-from devil.android import device_errors # pylint: disable=import-error
-from devil.android.ndk import abis  # pylint: disable=import-error
-from devil.android.tools import script_common  # pylint: disable=import-error
-from devil.utils import logging_common  # pylint: disable=import-error
-from py_utils import tempfile_ext  # pylint: disable=import-error
+import devil_chromium
+from devil.android import apk_helper
+from devil.android import device_errors
+from devil.android.ndk import abis
+from devil.android.tools import script_common
+from devil.utils import logging_common
+from py_utils import tempfile_ext
 
 _SUPPORTED_ARCH_DICT = {
     abis.ARM: 'arm',