From 590a6b526987f08f8b8160bce83c83aab0076a6e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Aug 2018 21:00:25 +1000 Subject: Cleanup: pep8 --- doc/python_api/rst_from_bmesh_opdefines.py | 6 ++++-- doc/python_api/sphinx_doc_gen.py | 2 +- release/scripts/startup/bl_operators/clip.py | 14 ++++++++------ release/scripts/startup/bl_ui/properties_constraint.py | 2 +- release/scripts/startup/bl_ui/properties_data_modifier.py | 2 -- .../startup/bl_ui/properties_grease_pencil_common.py | 1 - .../scripts/startup/bl_ui/properties_material_gpencil.py | 1 + release/scripts/startup/bl_ui/properties_physics_smoke.py | 4 +--- release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 4 +++- release/scripts/startup/bl_ui/space_topbar.py | 1 + release/scripts/startup/bl_ui/space_view3d.py | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/doc/python_api/rst_from_bmesh_opdefines.py b/doc/python_api/rst_from_bmesh_opdefines.py index 8357d063429..d9e2f7f12e7 100644 --- a/doc/python_api/rst_from_bmesh_opdefines.py +++ b/doc/python_api/rst_from_bmesh_opdefines.py @@ -76,8 +76,10 @@ def main(): for l in fsrc: l = l[:-1] # weak but ok - if ((("BMOpDefine" in l and l.split()[1] == "BMOpDefine") and "bmo_opdefines[]" not in l) or - ("static BMO_FlagSet " in l)): + if ( + (("BMOpDefine" in l and l.split()[1] == "BMOpDefine") and "bmo_opdefines[]" not in l) or + ("static BMO_FlagSet " in l) + ): is_block = True block_ctx = [] blocks.append((comment_ctx, block_ctx)) diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 14222d03d87..6e7d2e45f3a 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -349,7 +349,7 @@ INFO_DOCS = ( "Tips and Tricks: Hints to help you while writing scripts for Blender"), ("info_gotcha.rst", "Gotcha's: some of the problems you may come up against when writing scripts"), - ("change_log.rst", "List of changes since last Blender release"), + ("change_log.rst", "List of changes since last Blender release"), ) # only support for properties atm. diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index c9499388449..3c9fc012eeb 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -674,14 +674,16 @@ class CLIP_OT_setup_tracking_scene(Operator): # rendersettings setup_collection_recursively( - vlayers["Foreground"].collections[0].children, - "background", - "holdout") + vlayers["Foreground"].collections[0].children, + "background", + "holdout", + ) setup_collection_recursively( - vlayers["Background"].collections[0].children, - "foreground", - "indirect_only") + vlayers["Background"].collections[0].children, + "foreground", + "indirect_only", + ) @staticmethod def _wipeDefaultNodes(tree): diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py index 2ed9a7d365e..76b87a9011d 100644 --- a/release/scripts/startup/bl_ui/properties_constraint.py +++ b/release/scripts/startup/bl_ui/properties_constraint.py @@ -420,7 +420,7 @@ class ConstraintButtonsPanel: row.prop(con, "use_y", text="Y") row.prop(con, "use_z", text="Z") - row= layout.row() + row = layout.row() row.prop(con, "use_offset") row = row.row() row.active = con.use_offset diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 82616fdca82..b59447c3f1a 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -164,7 +164,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): layout.prop(md, "hn_strength") layout.prop(md, "set_wn_strength") - def BOOLEAN(self, layout, ob, md): split = layout.split() @@ -1787,7 +1786,6 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "create_materials") row.prop(md, "modify_color") - def GP_COLOR(self, layout, ob, md): gpd = ob.data split = layout.split() diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 588852c10ab..ded6106c5c3 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -735,7 +735,6 @@ class AnnotationDataPanel: row.operator("gpencil.active_frame_delete", text="", icon='X') - class GreasePencilOnionPanel: @staticmethod def draw_settings(layout, gp): diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py index 34cd38f42f4..549e3a36420 100644 --- a/release/scripts/startup/bl_ui/properties_material_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py @@ -306,6 +306,7 @@ class MATERIAL_PT_gpencil_options(GPMaterialButtonsPanel, Panel): gpcolor = ma.grease_pencil layout.prop(gpcolor, "pass_index") + class MATERIAL_PT_gpencil_material_presets(PresetMenu): """Material settings""" bl_label = "Material Presets" diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 7660eb4a2b9..7c9e843fcad 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -262,7 +262,6 @@ class PHYSICS_PT_smoke_behavior(PhysicButtonsPanel, Panel): col.prop(domain, "vorticity") - class PHYSICS_PT_smoke_behavior_dissolve(PhysicButtonsPanel, Panel): bl_label = "Dissolve" bl_parent_id = 'PHYSICS_PT_smoke_behavior' @@ -323,7 +322,6 @@ class PHYSICS_PT_smoke_flow_texture(PhysicButtonsPanel, Panel): self.layout.prop(flow_smoke, "use_texture", text="") - def draw(self, context): layout = self.layout layout.use_property_split = True @@ -332,7 +330,6 @@ class PHYSICS_PT_smoke_flow_texture(PhysicButtonsPanel, Panel): ob = context.object flow_smoke = context.smoke.flow_settings - sub = flow.column() sub.active = flow_smoke.use_texture sub.prop(flow_smoke, "noise_texture") @@ -350,6 +347,7 @@ class PHYSICS_PT_smoke_flow_texture(PhysicButtonsPanel, Panel): sub.prop(flow_smoke, "texture_offset") + class PHYSICS_PT_smoke_fire(PhysicButtonsPanel, Panel): bl_label = "Flames" bl_parent_id = 'PHYSICS_PT_smoke' diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 2151ef01e1f..68249ad25ba 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -196,6 +196,7 @@ class _defs_view3d_generic: ), ) + def _defs_annotate_factory(): class _defs_annotate: @@ -285,6 +286,7 @@ def _defs_annotate_factory(): ) return _defs_annotate + # Needed so annotation gets a keymap per space type. _defs_annotate_image = _defs_annotate_factory() _defs_annotate_view3d = _defs_annotate_factory() @@ -984,6 +986,7 @@ class _defs_sculpt: ), ) + class _defs_vertex_paint: @staticmethod @@ -1153,7 +1156,6 @@ class _defs_gpencil_paint: row.template_greasepencil_color(gp_settings, "material", rows=3, cols=8, scale=0.8) row.prop(gp_settings, "pin_material", text="") - @staticmethod def draw_settings_common(context, layout, tool): ob = context.active_object diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 8bf8e40d74e..8bafa3805b2 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -246,6 +246,7 @@ class _draw_left_context_mode: layout.row().prop(brush, "puff_mode", expand=True) layout.prop(brush, "use_puff_volume") + class INFO_MT_editor_menus(Menu): bl_idname = "INFO_MT_editor_menus" bl_label = "" diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 538791056ae..0f6f3fab617 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3069,8 +3069,8 @@ class VIEW3D_MT_edit_mesh_normals(Menu): layout.operator("mesh.smoothen_normals", text="Smoothen") layout.label(text="Face Strength") - layout.operator("mesh.mod_weighted_strength", text="Face select", icon = "FACESEL").set = False - layout.operator("mesh.mod_weighted_strength", text="Set Strength", icon = "ZOOMIN").set = True + layout.operator("mesh.mod_weighted_strength", text="Face Select", icon='FACESEL').set = False + layout.operator("mesh.mod_weighted_strength", text="Set Strength", icon='ZOOMIN').set = True class VIEW3D_MT_edit_mesh_shading(Menu): -- cgit v1.2.3