From 6fcd84721cca5feb068880fc43e3009e448a76a6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 4 Feb 2025 14:51:17 +1100 Subject: [PATCH] Cleanup: quiet some warnings from check_pep8 target --- intern/cycles/app/io_export_cycles_xml.py | 2 +- release/release_notes/bug_fixes_per_major_release.py | 2 +- scripts/modules/bpy_extras/node_shader_utils.py | 4 ++-- scripts/startup/bl_operators/anim.py | 2 +- scripts/startup/bl_ui/properties_data_mesh.py | 2 +- scripts/startup/bl_ui/space_view3d.py | 2 +- tests/python/bl_blendfile_versioning.py | 11 ++++++----- tests/python/bl_node_group_compat.py | 12 ++++++------ tests/python/bl_usd_export_test.py | 2 +- tests/python/modules/io_report.py | 2 +- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/intern/cycles/app/io_export_cycles_xml.py b/intern/cycles/app/io_export_cycles_xml.py index f5aa70bf2d6..08c097f1eef 100644 --- a/intern/cycles/app/io_export_cycles_xml.py +++ b/intern/cycles/app/io_export_cycles_xml.py @@ -54,7 +54,7 @@ class CyclesXMLSettings(bpy.types.PropertyGroup): # User Interface Drawing Code. -class RenderButtonsPanel(): +class RenderButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "render" diff --git a/release/release_notes/bug_fixes_per_major_release.py b/release/release_notes/bug_fixes_per_major_release.py index d24fb6a85e2..627f02500fd 100644 --- a/release/release_notes/bug_fixes_per_major_release.py +++ b/release/release_notes/bug_fixes_per_major_release.py @@ -262,7 +262,7 @@ def url_json_get(url: str) -> Any: # ----------------------------------------------------------------------------- # Commit Info Class -class CommitInfo(): +class CommitInfo: __slots__ = ( "hash", "commit_title", diff --git a/scripts/modules/bpy_extras/node_shader_utils.py b/scripts/modules/bpy_extras/node_shader_utils.py index 5cc82b82c3c..5c72f92ea0a 100644 --- a/scripts/modules/bpy_extras/node_shader_utils.py +++ b/scripts/modules/bpy_extras/node_shader_utils.py @@ -55,7 +55,7 @@ def node_input_value_get(node, input, default_value=None): return node.inputs[input].default_value -class ShaderWrapper(): +class ShaderWrapper: """ Base class with minimal common ground for all types of shader interfaces we may want/need to implement. """ @@ -575,7 +575,7 @@ class PrincipledBSDFWrapper(ShaderWrapper): normalmap_texture = property(normalmap_texture_get) -class ShaderImageTextureWrapper(): +class ShaderImageTextureWrapper: """ Generic 'image texture'-like wrapper, handling image node, some mapping (texture coordinates transformations), and texture coordinates source. diff --git a/scripts/startup/bl_operators/anim.py b/scripts/startup/bl_operators/anim.py index 39da6097af2..cb49ee43733 100644 --- a/scripts/startup/bl_operators/anim.py +++ b/scripts/startup/bl_operators/anim.py @@ -736,7 +736,7 @@ class ANIM_OT_slot_unassign_from_id(Operator): return {'FINISHED'} -class generic_slot_unassign_mixin(): +class generic_slot_unassign_mixin: context_property_name = "" """Which context attribute to use to get the to-be-manipulated data-block.""" diff --git a/scripts/startup/bl_ui/properties_data_mesh.py b/scripts/startup/bl_ui/properties_data_mesh.py index 6a542516f35..758d9fbd0ce 100644 --- a/scripts/startup/bl_ui/properties_data_mesh.py +++ b/scripts/startup/bl_ui/properties_data_mesh.py @@ -610,7 +610,7 @@ def draw_attribute_warnings(context, layout): layout.label(text=rpt_("Name collisions: ") + ", ".join(set(colliding_names)), icon='ERROR', translate=False) -class ColorAttributesListBase(): +class ColorAttributesListBase: display_domain_names = { 'POINT': "Vertex", 'EDGE': "Edge", diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 57697a1147f..612fa2eda83 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -8804,7 +8804,7 @@ class View3DAssetShelf(BrushAssetShelf): bl_space_type = "VIEW_3D" -class AssetShelfHiddenByDefault(): +class AssetShelfHiddenByDefault: # Take #BrushAssetShelf.bl_options but remove the 'DEFAULT_VISIBLE' flag. bl_options = {option for option in BrushAssetShelf.bl_options if option != 'DEFAULT_VISIBLE'} diff --git a/tests/python/bl_blendfile_versioning.py b/tests/python/bl_blendfile_versioning.py index 2f8858de6b8..fb16c0bda11 100644 --- a/tests/python/bl_blendfile_versioning.py +++ b/tests/python/bl_blendfile_versioning.py @@ -83,11 +83,12 @@ class TestBlendFileOpenAllTestFiles(TestHelper): slice_stride_base = total_len // slice_range slice_stride_remain = total_len % slice_range - def gen_indices(i): return ( - (i * (slice_stride_base + 1)) - if i < slice_stride_remain else - (slice_stride_remain * (slice_stride_base + 1)) + ((i - slice_stride_remain) * slice_stride_base) - ) + def gen_indices(i): + return ( + (i * (slice_stride_base + 1)) + if i < slice_stride_remain else + (slice_stride_remain * (slice_stride_base + 1)) + ((i - slice_stride_remain) * slice_stride_base) + ) slice_indices = [(gen_indices(i), gen_indices(i + 1)) for i in range(slice_range)] return slice_indices[slice_index] diff --git a/tests/python/bl_node_group_compat.py b/tests/python/bl_node_group_compat.py index f5d79bef07a..11188746b1c 100644 --- a/tests/python/bl_node_group_compat.py +++ b/tests/python/bl_node_group_compat.py @@ -224,11 +224,11 @@ class NodeGroupVersioning36Test(AbstractNodeGroupInterfaceTest): # autopep8: off self.compare_group_to_specs(group, node, [ SocketSpec("Output Float", "Output_9", "VALUE", hide_value=True, default_value=3.0, min_value=1.0, max_value=1.0), - SocketSpec("Output Vector", "Output_10", "VECTOR", subtype="EULER", default_value=( 10, 20, 30), min_value=-10.0, max_value=10.0), + SocketSpec("Output Vector", "Output_10", "VECTOR", subtype="EULER", default_value=(10, 20, 30), min_value=-10.0, max_value=10.0), SocketSpec("Output Color", "Output_11", "RGBA", default_value=(0, 1, 1, 1)), SocketSpec("Input Float", "Input_6", "VALUE", subtype="ANGLE", default_value=-20.0, min_value=5.0, max_value=6.0), - SocketSpec("Input Vector", "Input_7", "VECTOR", hide_value=True, default_value=( 2, 4, 6), min_value=-4.0, max_value=100.0), + SocketSpec("Input Vector", "Input_7", "VECTOR", hide_value=True, default_value=(2, 4, 6), min_value=-4.0, max_value=100.0), SocketSpec("Input Color", "Input_8", "RGBA", default_value=(0.5, 0.4, 0.3, 0.2)), ]) # autopep8: on @@ -245,12 +245,12 @@ class NodeGroupVersioning36Test(AbstractNodeGroupInterfaceTest): # autopep8: off self.compare_group_to_specs(group, node, [ SocketSpec("Output Float", "Output_30", "VALUE", hide_value=True, default_value=3.0, min_value=1.0, max_value=1.0), - SocketSpec("Output Vector", "Output_31", "VECTOR", subtype="EULER", default_value=( 10, 20, 30), min_value=-10.0, max_value=10.0), + SocketSpec("Output Vector", "Output_31", "VECTOR", subtype="EULER", default_value=(10, 20, 30), min_value=-10.0, max_value=10.0), SocketSpec("Output Color", "Output_32", "RGBA", default_value=(0, 1, 1, 1)), SocketSpec("Output Shader", "Output_33", "SHADER"), SocketSpec("Input Float", "Input_26", "VALUE", subtype="ANGLE", default_value=-20.0, min_value=5.0, max_value=6.0), - SocketSpec("Input Vector", "Input_27", "VECTOR", hide_value=True, default_value=( 2, 4, 6), min_value=-4.0, max_value=100.0), + SocketSpec("Input Vector", "Input_27", "VECTOR", hide_value=True, default_value=(2, 4, 6), min_value=-4.0, max_value=100.0), SocketSpec("Input Color", "Input_28", "RGBA", default_value=(0.5, 0.4, 0.3, 0.2)), SocketSpec("Input Shader", "Input_29", "SHADER"), ]) @@ -268,7 +268,7 @@ class NodeGroupVersioning36Test(AbstractNodeGroupInterfaceTest): # autopep8: off self.compare_group_to_specs(group, node, [ SocketSpec("Output Float", "Output_7", "VALUE", hide_value=True, default_value=3.0, min_value=1.0, max_value=1.0), - SocketSpec("Output Vector", "Output_8", "VECTOR", subtype="EULER", default_value=( 10, 20, 30), min_value=-10.0, max_value=10.0), + SocketSpec("Output Vector", "Output_8", "VECTOR", subtype="EULER", default_value=(10, 20, 30), min_value=-10.0, max_value=10.0), SocketSpec("Output Color", "Output_9", "RGBA", default_value=(0, 1, 1, 1)), SocketSpec("Output String", "Output_19", "STRING", default_value=""), SocketSpec("Output Bool", "Output_20", "BOOLEAN", default_value=False), @@ -281,7 +281,7 @@ class NodeGroupVersioning36Test(AbstractNodeGroupInterfaceTest): SocketSpec("Output Image", "Output_27", "IMAGE", default_value=bpy.data.images['TestImage']), SocketSpec("Input Float", "Input_4", "VALUE", subtype="ANGLE", default_value=-20.0, min_value=5.0, max_value=6.0), - SocketSpec("Input Vector", "Input_5", "VECTOR", hide_value=True, default_value=( 2, 4, 6), min_value=-4.0, max_value=100.0), + SocketSpec("Input Vector", "Input_5", "VECTOR", hide_value=True, default_value=(2, 4, 6), min_value=-4.0, max_value=100.0), SocketSpec("Input Color", "Input_6", "RGBA", default_value=(0.5, 0.4, 0.3, 0.2)), SocketSpec("Input String", "Input_10", "STRING", default_value="hello world!"), SocketSpec("Input Bool", "Input_11", "BOOLEAN", default_value=True, hide_in_modifier=True), diff --git a/tests/python/bl_usd_export_test.py b/tests/python/bl_usd_export_test.py index db1c28b960c..4b13ba87dc6 100644 --- a/tests/python/bl_usd_export_test.py +++ b/tests/python/bl_usd_export_test.py @@ -1491,7 +1491,7 @@ class USDExportTest(AbstractUSDTest): f"Exported texture {tex_path} doesn't exist") -class USDHookBase(): +class USDHookBase: instructions = {} responses = {} diff --git a/tests/python/modules/io_report.py b/tests/python/modules/io_report.py index 59429e1d871..eb6d14c66a1 100644 --- a/tests/python/modules/io_report.py +++ b/tests/python/modules/io_report.py @@ -242,7 +242,7 @@ class Report: if isinstance(val, bpy.types.MeshLoop): return f"{val.vertex_index}" if isinstance(val, bpy.types.MeshEdge): - return f"{min(val.vertices[0],val.vertices[1])}/{max(val.vertices[0],val.vertices[1])}" + return f"{min(val.vertices[0], val.vertices[1])}/{max(val.vertices[0], val.vertices[1])}" if isinstance(val, bpy.types.MaterialSlot): return f"('{val.name}', {val.link})" if isinstance(val, bpy.types.VertexGroup):