From 9567ac1272717ccc6da41bdb32188611b4ebd620 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 16 Apr 2025 11:08:40 +1000 Subject: [PATCH] Cleanup: quiet python linter warnings --- doc/python_api/sphinx_changelog_gen.py | 2 +- scripts/modules/bl_keymap_utils/versioning.py | 2 +- scripts/startup/bl_operators/userpref.py | 1 - scripts/startup/bl_operators/uvcalc_lightmap.py | 4 ++-- scripts/startup/bl_ui/space_outliner.py | 2 -- scripts/startup/bl_ui/space_userpref.py | 2 +- scripts/startup/nodeitems_builtins.py | 2 -- tools/check_source/static_check_cppcheck.py | 1 + tools/triage/weekly_report.py | 2 +- tools/utils/authors_git_gen.py | 2 +- tools/utils/blend2json.py | 4 ++-- tools/utils/blender_theme_as_c.py | 1 + tools/utils/git_log_review_commits.py | 1 + tools/utils_maintenance/trailing_space_clean.py | 4 ++-- 14 files changed, 14 insertions(+), 16 deletions(-) diff --git a/doc/python_api/sphinx_changelog_gen.py b/doc/python_api/sphinx_changelog_gen.py index fd7419476bf..aca8214b830 100644 --- a/doc/python_api/sphinx_changelog_gen.py +++ b/doc/python_api/sphinx_changelog_gen.py @@ -112,7 +112,7 @@ def api_dump(args): dump_module = dump["bpy.types"] = {} struct = rna_info.BuildRNAInfo()[0] - for struct_id, struct_info in sorted(struct.items()): + for _struct_id, struct_info in sorted(struct.items()): struct_id_str = struct_info.identifier diff --git a/scripts/modules/bl_keymap_utils/versioning.py b/scripts/modules/bl_keymap_utils/versioning.py index 34393b71f27..7dce706a150 100644 --- a/scripts/modules/bl_keymap_utils/versioning.py +++ b/scripts/modules/bl_keymap_utils/versioning.py @@ -33,7 +33,7 @@ def keyconfig_update(keyconfig_data, keyconfig_version): nonlocal has_copy changed_items = [] - for km_index, (km_name, _km_parms, km_items_data) in enumerate(keyconfig_data): + for km_index, (_km_name, _km_parms, km_items_data) in enumerate(keyconfig_data): for kmi_item_index, (item_op, item_event, item_prop) in enumerate(km_items_data["items"]): if item_prop and item_op in op_prop_map: properties = item_prop.get("properties", []) diff --git a/scripts/startup/bl_operators/userpref.py b/scripts/startup/bl_operators/userpref.py index 5e257f03317..642005e8634 100644 --- a/scripts/startup/bl_operators/userpref.py +++ b/scripts/startup/bl_operators/userpref.py @@ -543,7 +543,6 @@ class PREFERENCES_OT_addon_disable(Operator): _wm_wait_cursor(True) module_name = self.module - is_extension = addon_utils.check_extension(module_name) addon_utils.disable(module_name, default_set=True, handle_error=err_cb) if err_str: diff --git a/scripts/startup/bl_operators/uvcalc_lightmap.py b/scripts/startup/bl_operators/uvcalc_lightmap.py index 2dce181d730..e6f46cc7a09 100644 --- a/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -320,11 +320,11 @@ def lightmap_uvpack( if added_ids[i]: continue tri1 = tri_lengths[i] - f1, lens1, lo1 = tri1 + _f1, lens1, lo1 = tri1 sorted_l = (lens1[lo1[0]], lens1[lo1[1]], lens1[lo1[2]]) added_ids[i] = True - vec, nearest, dist = kd.find(sorted_l, filter=lambda idx: not added_ids[idx]) + _vec, nearest, dist = kd.find(sorted_l, filter=lambda idx: not added_ids[idx]) if not nearest or nearest < 0: pretty_faces.append(prettyface((tri1, None))) break diff --git a/scripts/startup/bl_ui/space_outliner.py b/scripts/startup/bl_ui/space_outliner.py index ca2479c92dc..939378c304c 100644 --- a/scripts/startup/bl_ui/space_outliner.py +++ b/scripts/startup/bl_ui/space_outliner.py @@ -176,8 +176,6 @@ class OUTLINER_MT_id_data(Menu): def draw(self, context): layout = self.layout - space = context.space_data - layout.operator_enum("outliner.id_operation", "type") id_linked = getattr(context, "id", None) diff --git a/scripts/startup/bl_ui/space_userpref.py b/scripts/startup/bl_ui/space_userpref.py index 9b4a7b1a428..5c2fc3aeee2 100644 --- a/scripts/startup/bl_ui/space_userpref.py +++ b/scripts/startup/bl_ui/space_userpref.py @@ -1721,7 +1721,7 @@ class USERPREF_PT_file_paths_asset_libraries(FilePathsPanel, Panel): class USERPREF_UL_asset_libraries(UIList): - def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index): + def draw_item(self, _context, layout, _data, item, _icon, _active_data, _active_propname, _index): asset_library = item if self.layout_type in {'DEFAULT', 'COMPACT'}: diff --git a/scripts/startup/nodeitems_builtins.py b/scripts/startup/nodeitems_builtins.py index fd07e81aeb1..5c292bcfb46 100644 --- a/scripts/startup/nodeitems_builtins.py +++ b/scripts/startup/nodeitems_builtins.py @@ -5,8 +5,6 @@ import bpy from nodeitems_utils import ( NodeCategory, - NodeItem, - NodeItemCustom, ) diff --git a/tools/check_source/static_check_cppcheck.py b/tools/check_source/static_check_cppcheck.py index 9155fc28257..a98d6bdf40c 100755 --- a/tools/check_source/static_check_cppcheck.py +++ b/tools/check_source/static_check_cppcheck.py @@ -258,6 +258,7 @@ def cppcheck(cppcheck_dir: str, temp_dir: str, log_fh: IO[bytes]) -> None: process_functions = [] def my_process(i: int, c: str, cmd: list[str]) -> subprocess.Popen[Any]: + del c proc = subprocess.Popen( cmd, stderr=subprocess.PIPE, diff --git a/tools/triage/weekly_report.py b/tools/triage/weekly_report.py index 8b4714e21f6..168a4fe5e8c 100755 --- a/tools/triage/weekly_report.py +++ b/tools/triage/weekly_report.py @@ -55,7 +55,7 @@ if IS_ATTY: print(text, end="\r", flush=True) else: def print_progress(text: str) -> None: - pass + del text def argparse_create() -> argparse.ArgumentParser: diff --git a/tools/utils/authors_git_gen.py b/tools/utils/authors_git_gen.py index b4b4dd4d3cd..e219d0298a2 100755 --- a/tools/utils/authors_git_gen.py +++ b/tools/utils/authors_git_gen.py @@ -200,7 +200,7 @@ class Credits: chunk_size = 256 chunk_list = [] chunk = [] - for i, c in enumerate(commit_iter): + for c in commit_iter: chunk.append(c) if len(chunk) >= chunk_size: chunk_list.append(chunk) diff --git a/tools/utils/blend2json.py b/tools/utils/blend2json.py index aad638e3223..e570099fd7f 100755 --- a/tools/utils/blend2json.py +++ b/tools/utils/blend2json.py @@ -258,7 +258,7 @@ def bblocks_to_json(args, fw, blend, address_map, indent, indent_step): indent = indent + indent_step is_first = True - for i, block in enumerate(blend.blocks): + for block in blend.blocks: if block.user_data is None or block.user_data > 0: meta_keyval = gen_meta_keyval(blend, block) if full_data: @@ -280,7 +280,7 @@ def bdna_to_json(args, fw, blend, indent, indent_step): def bdna_fields_to_json(blend, dna, indent, indent_step): lst = [] - for i, field in enumerate(dna.fields): + for field in dna.fields: keyval = ( ("dna_name", json_dumps(field.dna_name.name_only)), ("dna_type_id", json_dumps(field.dna_type.dna_type_id)), diff --git a/tools/utils/blender_theme_as_c.py b/tools/utils/blender_theme_as_c.py index a1f457043de..828e257e495 100755 --- a/tools/utils/blender_theme_as_c.py +++ b/tools/utils/blender_theme_as_c.py @@ -266,6 +266,7 @@ def file_remove_empty_braces(source_dst): import re def key_replace(match): + del match return "" data_prev = None # Braces may become empty by removing nested diff --git a/tools/utils/git_log_review_commits.py b/tools/utils/git_log_review_commits.py index a57b4548fe0..bc9eee2c0f8 100755 --- a/tools/utils/git_log_review_commits.py +++ b/tools/utils/git_log_review_commits.py @@ -37,6 +37,7 @@ class _GetchUnix: def __init__(self): import tty + del tty def __call__(self): import tty diff --git a/tools/utils_maintenance/trailing_space_clean.py b/tools/utils_maintenance/trailing_space_clean.py index d6ad3b8b254..687d0a4c77d 100755 --- a/tools/utils_maintenance/trailing_space_clean.py +++ b/tools/utils_maintenance/trailing_space_clean.py @@ -10,14 +10,14 @@ __all__ = ( import os from os.path import join -from trailing_space_clean_config import PATHS - from collections.abc import ( Callable, Iterator, Sequence, ) +from trailing_space_clean_config import PATHS + SOURCE_EXT = ( # C/C++ ".c", ".h", ".cpp", ".hpp", ".cc", ".hh", ".cxx", ".hxx", ".inl",