From cc1a3f19b49ff954972fedd34ffb5067e425dc7a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 7 Oct 2025 09:15:20 +1100 Subject: [PATCH] Cleanup: resolve various pylint warnings from recent changes --- scripts/modules/bpy_extras/anim_utils.py | 15 +++++++-------- .../startup/bl_operators/copy_global_transform.py | 4 ++-- scripts/startup/bl_ui/node_add_menu_compositor.py | 2 ++ scripts/startup/bl_ui/node_add_menu_geometry.py | 3 +++ .../startup/bl_ui/properties_strip_modifier.py | 7 ------- scripts/startup/bl_ui/space_sequencer.py | 1 - scripts/startup/bl_ui/space_time.py | 2 +- 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/scripts/modules/bpy_extras/anim_utils.py b/scripts/modules/bpy_extras/anim_utils.py index 181d2b74436..d0fbfd7f108 100644 --- a/scripts/modules/bpy_extras/anim_utils.py +++ b/scripts/modules/bpy_extras/anim_utils.py @@ -14,12 +14,6 @@ __all__ = ( "BakeOptions", ) -import bpy -from bpy.types import ( - Context, Action, ActionSlot, ActionChannelbag, - Object, PoseBone, KeyingSet, -) - import contextlib from dataclasses import dataclass from typing import Iterable, Optional, Union, Iterator @@ -28,6 +22,12 @@ from collections.abc import ( Sequence, ) +import bpy +from bpy.types import ( + Context, Action, ActionSlot, ActionChannelbag, + Object, PoseBone, KeyingSet, +) + from rna_prop_ui import ( rna_idprop_value_to_python, ) @@ -886,8 +886,7 @@ class AutoKeying: "Retrieve the lock status for 4D rotation." if bone.lock_rotations_4d: return [bone.lock_rotation_w, *bone.lock_rotation] - else: - return [all(bone.lock_rotation)] * 4 + return [all(bone.lock_rotation)] * 4 @classmethod def keyframe_channels( diff --git a/scripts/startup/bl_operators/copy_global_transform.py b/scripts/startup/bl_operators/copy_global_transform.py index a1f242e9daf..9f79707368d 100644 --- a/scripts/startup/bl_operators/copy_global_transform.py +++ b/scripts/startup/bl_operators/copy_global_transform.py @@ -16,7 +16,7 @@ from typing import Iterable, Optional, Any, TypeAlias import bpy from bpy.types import ( Context, Object, Operator, PoseBone, - Camera, ID, ActionChannelbag, PropertyGroup, + Camera, ID, ActionChannelbag, ) from mathutils import Matrix @@ -784,7 +784,7 @@ def _unregister_message_bus() -> None: @bpy.app.handlers.persistent # type: ignore -def _on_blendfile_load_post(none: Any, other_none: Any) -> None: +def _on_blendfile_load_post(_none: Any, _other_none: Any) -> None: # The parameters are required, but both are None. _register_message_bus() diff --git a/scripts/startup/bl_ui/node_add_menu_compositor.py b/scripts/startup/bl_ui/node_add_menu_compositor.py index 6a233a65a34..ee91b5dbc27 100644 --- a/scripts/startup/bl_ui/node_add_menu_compositor.py +++ b/scripts/startup/bl_ui/node_add_menu_compositor.py @@ -124,6 +124,7 @@ class NODE_MT_compositor_node_color_mix_base(node_add_menu.NodeMenu): menu_path = "Color/Mix" def draw(self, context): + del context layout = self.layout self.draw_assets_for_catalog(layout, self.menu_path) @@ -264,6 +265,7 @@ class NODE_MT_compositor_node_utilities_base(node_add_menu.NodeMenu): bl_label = "Utilities" def draw(self, context): + del context layout = self.layout self.draw_menu(layout, path="Utilities/Math") self.draw_menu(layout, path="Utilities/Vector") diff --git a/scripts/startup/bl_ui/node_add_menu_geometry.py b/scripts/startup/bl_ui/node_add_menu_geometry.py index cdb5cd92ad2..aa6e1a44846 100644 --- a/scripts/startup/bl_ui/node_add_menu_geometry.py +++ b/scripts/startup/bl_ui/node_add_menu_geometry.py @@ -517,6 +517,7 @@ class NODE_MT_gn_mesh_operations_base(node_add_menu.NodeMenu): menu_path = "Mesh/Operations" def draw(self, context): + del context layout = self.layout self.node_operator(layout, "GeometryNodeDualMesh") self.node_operator(layout, "GeometryNodeEdgePathsToCurves") @@ -607,6 +608,7 @@ class NODE_MT_gn_point_base(node_add_menu.NodeMenu): bl_label = "Point" def draw(self, context): + del context layout = self.layout self.node_operator(layout, "GeometryNodeDistributePointsInVolume") self.node_operator(layout, "GeometryNodeDistributePointsInGrid") @@ -946,6 +948,7 @@ class NODE_MT_gn_volume_operations_base(node_add_menu.NodeMenu): menu_path = "Volume/Operations" def draw(self, context): + del context layout = self.layout self.node_operator(layout, "GeometryNodeVolumeToMesh") self.node_operator(layout, "GeometryNodeGridToMesh") diff --git a/scripts/startup/bl_ui/properties_strip_modifier.py b/scripts/startup/bl_ui/properties_strip_modifier.py index 36c564ca98f..eeb64b60e6f 100644 --- a/scripts/startup/bl_ui/properties_strip_modifier.py +++ b/scripts/startup/bl_ui/properties_strip_modifier.py @@ -2,15 +2,9 @@ # # SPDX-License-Identifier: GPL-2.0-or-later -import bpy from bpy.types import ( Panel, ) -from bpy.app.translations import ( - contexts as i18n_contexts, - pgettext_rpt as rpt_, -) -from rna_prop_ui import PropertyPanel class StripModButtonsPanel: @@ -32,7 +26,6 @@ class STRIP_PT_modifiers(StripModButtonsPanel, Panel): layout.use_property_split = True strip = context.active_strip - ed = context.sequencer_scene.sequence_editor if strip.type == 'SOUND': sound = strip.sound else: diff --git a/scripts/startup/bl_ui/space_sequencer.py b/scripts/startup/bl_ui/space_sequencer.py index 82b78256de8..33a723cd406 100644 --- a/scripts/startup/bl_ui/space_sequencer.py +++ b/scripts/startup/bl_ui/space_sequencer.py @@ -11,7 +11,6 @@ from bpy.types import ( from bpy.app.translations import ( contexts as i18n_contexts, pgettext_iface as iface_, - pgettext_rpt as rpt_, ) from bl_ui.properties_grease_pencil_common import ( AnnotationDataPanel, diff --git a/scripts/startup/bl_ui/space_time.py b/scripts/startup/bl_ui/space_time.py index bb055ac1f53..9748dd1784f 100644 --- a/scripts/startup/bl_ui/space_time.py +++ b/scripts/startup/bl_ui/space_time.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later import bpy -from bpy.types import Menu, Panel +from bpy.types import Panel from bpy.app.translations import ( pgettext_n as n_, contexts as i18n_contexts,