From 3117de3a733e70959819ed6c1a76efddb879e269 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 23 Mar 2021 16:08:02 +1100 Subject: Cleanup: import operator class directly for Python operators --- release/scripts/startup/bl_operators/assets.py | 5 +++-- release/scripts/startup/bl_operators/clip.py | 6 +++--- release/scripts/startup/bl_operators/file.py | 9 ++++++--- release/scripts/startup/bl_operators/freestyle.py | 11 +++++++---- release/scripts/startup/bl_operators/geometry_nodes.py | 7 ++++--- release/scripts/startup/bl_operators/spreadsheet.py | 3 ++- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/release/scripts/startup/bl_operators/assets.py b/release/scripts/startup/bl_operators/assets.py index e7fbb155b2f..315e0dabbf4 100644 --- a/release/scripts/startup/bl_operators/assets.py +++ b/release/scripts/startup/bl_operators/assets.py @@ -20,13 +20,14 @@ from __future__ import annotations import bpy +from bpy.types import Operator from bpy_extras.asset_utils import ( SpaceAssetInfo, ) -class ASSET_OT_tag_add(bpy.types.Operator): +class ASSET_OT_tag_add(Operator): """Add a new keyword tag to the active asset""" bl_idname = "asset.tag_add" @@ -44,7 +45,7 @@ class ASSET_OT_tag_add(bpy.types.Operator): return {'FINISHED'} -class ASSET_OT_tag_remove(bpy.types.Operator): +class ASSET_OT_tag_remove(Operator): """Remove an existing keyword tag from the active asset""" bl_idname = "asset.tag_remove" diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index 51a9695e44a..a88f8fc638f 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -139,7 +139,7 @@ def CLIP_default_settings_from_track(clip, track, framenr): settings.default_weight = track.weight -class CLIP_OT_filter_tracks(bpy.types.Operator): +class CLIP_OT_filter_tracks(Operator): """Filter tracks which has weirdly looking spikes in motion curves""" bl_label = "Filter Tracks" bl_idname = "clip.filter_tracks" @@ -216,7 +216,7 @@ class CLIP_OT_filter_tracks(bpy.types.Operator): return {'FINISHED'} -class CLIP_OT_set_active_clip(bpy.types.Operator): +class CLIP_OT_set_active_clip(Operator): bl_label = "Set Active Clip" bl_idname = "clip.set_active_clip" @@ -1037,7 +1037,7 @@ class CLIP_OT_track_settings_as_default(Operator): return {'FINISHED'} -class CLIP_OT_track_settings_to_track(bpy.types.Operator): +class CLIP_OT_track_settings_to_track(Operator): """Copy tracking settings from active track to selected tracks""" bl_label = "Copy Track Settings" diff --git a/release/scripts/startup/bl_operators/file.py b/release/scripts/startup/bl_operators/file.py index 78a7ead71ca..672a4170325 100644 --- a/release/scripts/startup/bl_operators/file.py +++ b/release/scripts/startup/bl_operators/file.py @@ -19,7 +19,10 @@ # import bpy -from bpy.types import Operator +from bpy.types import ( + Operator, + OperatorFileListElement, +) from bpy.props import ( BoolProperty, CollectionProperty, @@ -38,7 +41,7 @@ class WM_OT_previews_batch_generate(Operator): # ----------- # File props. files: CollectionProperty( - type=bpy.types.OperatorFileListElement, + type=OperatorFileListElement, options={'HIDDEN', 'SKIP_SAVE'}, ) @@ -148,7 +151,7 @@ class WM_OT_previews_batch_clear(Operator): # ----------- # File props. files: CollectionProperty( - type=bpy.types.OperatorFileListElement, + type=OperatorFileListElement, options={'HIDDEN', 'SKIP_SAVE'}, ) diff --git a/release/scripts/startup/bl_operators/freestyle.py b/release/scripts/startup/bl_operators/freestyle.py index 393dd467e88..2e4bbe7c0bf 100644 --- a/release/scripts/startup/bl_operators/freestyle.py +++ b/release/scripts/startup/bl_operators/freestyle.py @@ -20,6 +20,9 @@ import bpy +from bpy.types import ( + Operator, +) from bpy.props import ( BoolProperty, EnumProperty, @@ -27,7 +30,7 @@ from bpy.props import ( ) -class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator): +class SCENE_OT_freestyle_fill_range_by_selection(Operator): """Fill the Range Min/Max entries by the min/max distance between selected mesh objects and the source object """ """(either a user-specified object or the active camera)""" bl_idname = "scene.freestyle_fill_range_by_selection" @@ -132,7 +135,7 @@ class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator): return {'FINISHED'} -class SCENE_OT_freestyle_add_edge_marks_to_keying_set(bpy.types.Operator): +class SCENE_OT_freestyle_add_edge_marks_to_keying_set(Operator): '''Add the data paths to the Freestyle Edge Mark property of selected edges to the active keying set''' bl_idname = "scene.freestyle_add_edge_marks_to_keying_set" bl_label = "Add Edge Marks to Keying Set" @@ -163,7 +166,7 @@ class SCENE_OT_freestyle_add_edge_marks_to_keying_set(bpy.types.Operator): return {'FINISHED'} -class SCENE_OT_freestyle_add_face_marks_to_keying_set(bpy.types.Operator): +class SCENE_OT_freestyle_add_face_marks_to_keying_set(Operator): '''Add the data paths to the Freestyle Face Mark property of selected polygons to the active keying set''' bl_idname = "scene.freestyle_add_face_marks_to_keying_set" bl_label = "Add Face Marks to Keying Set" @@ -194,7 +197,7 @@ class SCENE_OT_freestyle_add_face_marks_to_keying_set(bpy.types.Operator): return {'FINISHED'} -class SCENE_OT_freestyle_module_open(bpy.types.Operator): +class SCENE_OT_freestyle_module_open(Operator): """Open a style module file""" bl_idname = "scene.freestyle_module_open" bl_label = "Open Style Module File" diff --git a/release/scripts/startup/bl_operators/geometry_nodes.py b/release/scripts/startup/bl_operators/geometry_nodes.py index 0e7f8b7b1e7..0c7a2a01b7a 100644 --- a/release/scripts/startup/bl_operators/geometry_nodes.py +++ b/release/scripts/startup/bl_operators/geometry_nodes.py @@ -17,6 +17,7 @@ # ##### END GPL LICENSE BLOCK ##### import bpy +from bpy.types import Operator def geometry_node_group_empty_new(): @@ -48,7 +49,7 @@ def geometry_modifier_poll(context): return True -class NewGeometryNodesModifier(bpy.types.Operator): +class NewGeometryNodesModifier(Operator): """Create a new modifier with a new geometry node group""" bl_idname = "node.new_geometry_nodes_modifier" @@ -68,7 +69,7 @@ class NewGeometryNodesModifier(bpy.types.Operator): return {'FINISHED'} -class NewGeometryNodeTreeAssign(bpy.types.Operator): +class NewGeometryNodeTreeAssign(Operator): """Create a new geometry node group and assign it to the active modifier""" bl_idname = "node.new_geometry_node_group_assign" @@ -91,7 +92,7 @@ class NewGeometryNodeTreeAssign(bpy.types.Operator): return {'FINISHED'} -class CopyGeometryNodeTreeAssign(bpy.types.Operator): +class CopyGeometryNodeTreeAssign(Operator): """Copy the active geometry node group and assign it to the active modifier""" bl_idname = "node.copy_geometry_node_group_assign" diff --git a/release/scripts/startup/bl_operators/spreadsheet.py b/release/scripts/startup/bl_operators/spreadsheet.py index fa6568f6f11..2a194fd4627 100644 --- a/release/scripts/startup/bl_operators/spreadsheet.py +++ b/release/scripts/startup/bl_operators/spreadsheet.py @@ -19,8 +19,9 @@ from __future__ import annotations import bpy +from bpy.types import Operator -class SPREADSHEET_OT_toggle_pin(bpy.types.Operator): +class SPREADSHEET_OT_toggle_pin(Operator): '''Turn on or off pinning''' bl_idname = "spreadsheet.toggle_pin" bl_label = "Toggle Pin" -- cgit v1.2.3