From b1dc9a2733eb669a7fe69b7056d88b575df3519a Mon Sep 17 00:00:00 2001 From: goodov <5928869+goodov@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:32:30 +0700 Subject: [PATCH] Disable few pylint checks. (#25065) Update pylint rules. --- .style.yapf | 3 --- PRESUBMIT.py | 18 +++++++++--------- android/xml_processor.py | 6 ++++-- chromium_src/PRESUBMIT.py | 1 - .../bindings/scripts/bind_gen/interface.py | 2 +- .../build/scripts/make_instrumenting_probes.py | 2 -- .../common/py_utils/py_utils/cloud_storage.py | 2 +- .../json_schema_compiler/feature_compiler.py | 2 -- script/brave_chromium_utils.py | 2 +- script/chromium_presubmit_overrides.py | 3 +-- tools/chromium_src/check_chromium_src.py | 3 --- 11 files changed, 17 insertions(+), 27 deletions(-) diff --git a/.style.yapf b/.style.yapf index ed66caff930..c59e543efbf 100644 --- a/.style.yapf +++ b/.style.yapf @@ -1,9 +1,6 @@ [style] based_on_style = pep8 -# PEP-8 limits to 79 chars. Chromium uses 80 chars everywhere. -column_limit = 80 - # Workaround yapf dict formatting bug. # See for details: https://github.com/google/yapf/issues/392 allow_split_before_dict_value = False diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 7b9d8354a84..bcac924add3 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -16,8 +16,6 @@ import override_utils USE_PYTHON3 = True PRESUBMIT_VERSION = '2.0.0' -# pylint: disable=line-too-long - # Adds support for chromium_presubmit_config.json5 and some helpers. def CheckToModifyInputApi(input_api, _output_api): @@ -82,7 +80,6 @@ def CheckPatchFormatted(input_api, output_api): git_cl_format_cmd.append(input_api.PresubmitLocalPath()) with brave_chromium_utils.sys_path("//brave/vendor/depot_tools"): - # pylint: disable=import-outside-toplevel import git_cl # Run git cl format and get return code. @@ -159,7 +156,6 @@ def CheckESLint(input_api, output_api): include_deletes=False) with brave_chromium_utils.sys_path('//tools'): - # pylint: disable=import-outside-toplevel from web_dev_style import js_checker return js_checker.JSChecker(input_api, output_api).RunEsLintChecks(files_to_check) @@ -167,7 +163,6 @@ def CheckESLint(input_api, output_api): def CheckWebDevStyle(input_api, output_api): with brave_chromium_utils.sys_path('//tools'): - # pylint: disable=import-outside-toplevel from web_dev_style import presubmit_support, js_checker # Disable RunEsLintChecks, it's run separately in CheckESLint. with override_utils.override_scope_function( @@ -185,9 +180,15 @@ def CheckChangeLintsClean(input_api, output_api): def CheckPylint(input_api, output_api): extra_paths_list = os.environ['PYTHONPATH'].split(os.pathsep) - return input_api.canned_checks.RunPylint(input_api, - output_api, - extra_paths_list=extra_paths_list) + disabled_warnings = [ + 'import-outside-toplevel', + 'line-too-long', + ] + return input_api.canned_checks.RunPylint( + input_api, + output_api, + extra_paths_list=extra_paths_list, + disabled_warnings=disabled_warnings) def CheckLicense(input_api, output_api): @@ -467,7 +468,6 @@ def CheckJavaStyle(_original_check, input_api, output_api): return [] with brave_chromium_utils.sys_path('//tools/android/checkstyle'): - # pylint: disable=import-outside-toplevel import checkstyle files_to_skip = input_api.DEFAULT_FILES_TO_SKIP diff --git a/android/xml_processor.py b/android/xml_processor.py index 53b4bd86220..ef99e68665c 100755 --- a/android/xml_processor.py +++ b/android/xml_processor.py @@ -89,8 +89,10 @@ def _XMLTransform(source_pairs, outputs_zip): continue root = ET.XML(xml_content) - result = loaded_module._ProcessXML(root) # pylint: disable=line-too-long,protected-access - output = ET.tostring(result, encoding='utf-8', xml_declaration=True) + result = loaded_module._ProcessXML(root) # pylint: disable=protected-access + output = ET.tostring(result, + encoding='utf-8', + xml_declaration=True) # Parse output path # For simplicity, we assume input path will always has java/res in diff --git a/chromium_src/PRESUBMIT.py b/chromium_src/PRESUBMIT.py index 6de2b99bf6f..ef14eb2d135 100644 --- a/chromium_src/PRESUBMIT.py +++ b/chromium_src/PRESUBMIT.py @@ -50,7 +50,6 @@ def CheckOverriddenHeadersDeclareIWYUExport(input_api, output_api): def CheckOverrides(input_api, output_api): items = [] with brave_chromium_utils.sys_path('//brave/tools/chromium_src'): - # pylint: disable=import-outside-toplevel import check_chromium_src overrides = [ f.AbsoluteLocalPath() for f in input_api.AffectedSourceFiles(None) diff --git a/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py index ffb7396ba57..392a6fc8e20 100644 --- a/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/chromium_src/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py @@ -8,7 +8,7 @@ import re import brave_chromium_utils import override_utils -# pylint: disable=relative-beyond-top-level,line-too-long +# pylint: disable=relative-beyond-top-level from .code_node import SymbolNode, TextNode from .codegen_accumulator import CodeGenAccumulator from .codegen_context import CodeGenContext diff --git a/chromium_src/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py b/chromium_src/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py index 2e8a4ed9a02..24b9c2b76da 100644 --- a/chromium_src/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py +++ b/chromium_src/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py @@ -6,8 +6,6 @@ import brave_chromium_utils import override_utils -# pylint: disable=line-too-long - # Get gn arg to enable PageGraph. _IS_PG_ENABLED = brave_chromium_utils.get_gn_arg("enable_brave_page_graph") # Get gn arg to enable WebAPI probes. diff --git a/chromium_src/third_party/catapult/common/py_utils/py_utils/cloud_storage.py b/chromium_src/third_party/catapult/common/py_utils/py_utils/cloud_storage.py index 43d537b5be8..3a09b0a2d24 100644 --- a/chromium_src/third_party/catapult/common/py_utils/py_utils/cloud_storage.py +++ b/chromium_src/third_party/catapult/common/py_utils/py_utils/cloud_storage.py @@ -7,7 +7,7 @@ import brave_chromium_utils import override_utils with brave_chromium_utils.sys_path('//brave/tools/perf'): - from components.cloud_storage import CloudFolder, DownloadFileFromCloudStorage # pylint: disable=import-outside-toplevel + from components.cloud_storage import CloudFolder, DownloadFileFromCloudStorage @override_utils.override_function(globals()) diff --git a/chromium_src/tools/json_schema_compiler/feature_compiler.py b/chromium_src/tools/json_schema_compiler/feature_compiler.py index 51522ac5b1c..b849a6cffca 100644 --- a/chromium_src/tools/json_schema_compiler/feature_compiler.py +++ b/chromium_src/tools/json_schema_compiler/feature_compiler.py @@ -3,8 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at https://mozilla.org/MPL/2.0/. -# pylint: disable=line-too-long - import brave_chromium_utils import override_utils diff --git a/script/brave_chromium_utils.py b/script/brave_chromium_utils.py index 888e07191f1..bc65e6ad8aa 100644 --- a/script/brave_chromium_utils.py +++ b/script/brave_chromium_utils.py @@ -124,7 +124,7 @@ def get_gn_args(output_dir: str) -> Dict[str, Any]: raise FileNotFoundError(f"{ARGS_GN} not found in {output_dir}") with sys_path('//build'): - import gn_helpers # pylint: disable=import-outside-toplevel + import gn_helpers with open(args_gn_filename, "r") as f: return gn_helpers.FromGNArgs(f.read()) diff --git a/script/chromium_presubmit_overrides.py b/script/chromium_presubmit_overrides.py index fae084feb23..263d20d87b0 100644 --- a/script/chromium_presubmit_overrides.py +++ b/script/chromium_presubmit_overrides.py @@ -15,7 +15,7 @@ import traceback import brave_chromium_utils import override_utils -# pylint: disable=line-too-long,protected-access,unused-variable +# pylint: disable=protected-access,unused-variable CANNED_CHECKS_KEY = 'canned' @@ -23,7 +23,6 @@ CANNED_CHECKS_KEY = 'canned' # Helper to load json5 presubmit config. def load_presubmit_config(): with brave_chromium_utils.sys_path('//third_party/pyjson5/src'): - # pylint: disable=import-outside-toplevel import json5 return json5.load( open( diff --git a/tools/chromium_src/check_chromium_src.py b/tools/chromium_src/check_chromium_src.py index c29de79c3d1..bf872bcd7e2 100755 --- a/tools/chromium_src/check_chromium_src.py +++ b/tools/chromium_src/check_chromium_src.py @@ -31,10 +31,8 @@ BRAVE_SRC = os.path.abspath( BRAVE_CHROMIUM_SRC = os.path.join(BRAVE_SRC, 'chromium_src') CHROMIUM_SRC = os.path.abspath(os.path.dirname(BRAVE_SRC)) -# pylint: disable=line-too-long NORMAL_DEFINITIONS_REGEXP = r'^#define[\s\\]+([a-zA-Z0-9_]+[^\s\(]*)(?:[ \t]+\\\s*|[ \t])?([a-zA-Z0-9_]+[^\s\(]*)?$' FUNCTION_LIKE_DEFINITIONS_REGEXP = r'^#define[\s\\]+([a-zA-Z0-9_]+)[\s\\]*\(.*?\)(?:[ \t]+\\\s*|[ \t])?([a-zA-Z0-9_]*[\s\\]*\(.*?\))?' -# pylint: enable=line-too-long def strip_comments(content): @@ -456,7 +454,6 @@ class ChromiumSrcOverridesChecker: json5_path = os.path.join(CHROMIUM_SRC, 'third_party', 'pyjson5', 'src') sys.path.append(json5_path) - # pylint: disable=import-outside-toplevel import json5 with open(config_path, "r", encoding='utf-8') as exclusions_file: