Cleanup: pep8

2014-09-17 18:36:17 +10:00 · 2014-09-17 18:36:17 +10:00 · 0e0e528ea4
parent f0f398dcf3
commit 0e0e528ea4
27 changed files with 82 additions and 95 deletions
--- a/doc/python_api/examples/bpy.props.5.py
+++ b/doc/python_api/examples/bpy.props.5.py
@ -75,7 +75,7 @@ print(scene.test_float)
 scene.test_array = (True, False)
 print([x for x in scene.test_array])

-#scene.test_date = "blah"   # this would fail, property is read-only
+# scene.test_date = "blah"   # this would fail, property is read-only
 print(scene.test_date)

 scene.test_enum = 'BLUE'
--- a/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py
+++ b/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py
@ -8,4 +8,3 @@ collection.foreach_get(attr, some_seq)
 # Python equivalent
 for i in range(len(seq)):
    some_seq[i] = getattr(collection[i], attr)
-
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@ -1,22 +1,22 @@
- # ***** BEGIN GPL LICENSE BLOCK *****
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # Contributor(s): Campbell Barton, Luca Bonavita
- #
- # #**** END GPL LICENSE BLOCK #****
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Campbell Barton
+#
+# ##### END GPL LICENSE BLOCK #####

 # <pep8 compliant>

--- a/doc/python_api/sphinx_doc_gen_monkeypatch.py
+++ b/doc/python_api/sphinx_doc_gen_monkeypatch.py
@ -1,22 +1,22 @@
- # ***** BEGIN GPL LICENSE BLOCK *****
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # Contributor(s): Campbell Barton
- #
- # #**** END GPL LICENSE BLOCK #****
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Campbell Barton
+#
+# ##### END GPL LICENSE BLOCK #####

 # <pep8 compliant>

--- a/intern/cycles/blender/addon/init.py
+++ b/intern/cycles/blender/addon/init.py
@ -33,6 +33,7 @@ import bpy
 from . import engine
 from . import version_update

+
 class CyclesRender(bpy.types.RenderEngine):
    bl_idname = 'CYCLES'
    bl_label = "Cycles Render"
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@ -567,7 +567,7 @@ class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
        layout = self.layout

        rd = context.scene.render
-        scene = context.scene
+        # scene = context.scene

        layout.active = rd.use_motion_blur

@ -580,7 +580,7 @@ class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
        layout = self.layout

        rd = context.scene.render
-        scene = context.scene
+        # scene = context.scene

        ob = context.object
        cob = ob.cycles
@ -982,7 +982,7 @@ class CyclesMaterial_PT_volume(CyclesButtonsPanel, Panel):
        layout = self.layout

        mat = context.material
-        cmat = mat.cycles
+        # cmat = mat.cycles

        panel_node_draw(layout, mat, 'OUTPUT_MATERIAL', 'Volume')

@ -1209,7 +1209,6 @@ class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel):

    @classmethod
    def poll(cls, context):
-        scene = context.scene
        psys = context.particle_system
        return CyclesButtonsPanel.poll(context) and psys and psys.settings.type == 'HAIR'

@ -1284,7 +1283,7 @@ class CyclesRender_PT_bake(CyclesButtonsPanel, Panel):
            box.prop(cbk, "normal_space", text="Space")

            row = box.row(align=True)
-            row.label(text = "Swizzle:")
+            row.label(text="Swizzle:")
            row.prop(cbk, "normal_r", text="")
            row.prop(cbk, "normal_g", text="")
            row.prop(cbk, "normal_b", text="")
--- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
+++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
@ -343,10 +343,10 @@ def dump_rna_messages(msgs, reports, settings, verbose=False):
            process_msg(msgs, default_context, cls.__doc__, msgsrc, reports, check_ctxt_rna_tip, settings)

        # Panels' "tabs" system.
-        if hasattr(bl_rna, 'bl_category') and  bl_rna.bl_category:
+        if hasattr(bl_rna, 'bl_category') and bl_rna.bl_category:
            process_msg(msgs, default_context, bl_rna.bl_category, msgsrc, reports, check_ctxt_rna, settings)

-        if hasattr(bl_rna, 'bl_label') and  bl_rna.bl_label:
+        if hasattr(bl_rna, 'bl_label') and bl_rna.bl_label:
            process_msg(msgs, msgctxt, bl_rna.bl_label, msgsrc, reports, check_ctxt_rna, settings)

        walk_properties(cls)
--- a/release/scripts/modules/bl_i18n_utils/utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils.py
@ -1343,7 +1343,7 @@ class I18n:
        #key = self.settings.PO_HEADER_KEY
        #for uid, trans in self.trans.items():
            #if key not in trans.msgs:
-                #trans.msgs[key] 
+                #trans.msgs[key]
        self.unescape()

    def write(self, kind, langs=set()):
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@ -694,7 +694,7 @@ class _GenericUI:
        draw_funcs = cls._dyn_ui_initialize()
        try:
            draw_funcs.remove(draw_func)
-        except:
+        except ValueError:
            pass


--- a/release/scripts/modules/rna_xml.py
+++ b/release/scripts/modules/rna_xml.py
@ -92,7 +92,6 @@ def rna2xml(fw=print_ln,
        bpy.types.Sequence,
        )

-
    def number_to_str(val, val_type):
        if val_type == int:
            return "%d" % val
@ -245,13 +244,13 @@ def xml2rna(root_xml,
            ):

    def rna2xml_node(xml_node, value):
-#        print("evaluating:", xml_node.nodeName)
+        # print("evaluating:", xml_node.nodeName)

        # ---------------------------------------------------------------------
        # Simple attributes

        for attr in xml_node.attributes.keys():
-#            print("  ", attr)
+            # print("  ", attr)
            subvalue = getattr(value, attr, Ellipsis)

            if subvalue is Ellipsis:
--- a/release/scripts/startup/bl_operators/init.py
+++ b/release/scripts/startup/bl_operators/init.py
@ -9,7 +9,7 @@
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-#,
+#
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--- a/release/scripts/startup/bl_operators/anim.py
+++ b/release/scripts/startup/bl_operators/anim.py
@ -306,7 +306,8 @@ class UpdateAnimatedTransformConstraint(Operator):
        paths = from_paths | to_paths

        def update_cb(base, class_name, old_path, fcurve, options):
-            print(options)
+            # print(options)
+
            def handle_deg2rad(fcurve):
                if fcurve is not None:
                    if hasattr(fcurve, "keyframes"):
--- a/release/scripts/startup/bl_operators/object_quick_effects.py
+++ b/release/scripts/startup/bl_operators/object_quick_effects.py
@ -289,8 +289,8 @@ def obj_bb_minmax(obj, min_co, max_co):
        max_co[0] = max(bb_vec[0], max_co[0])
        max_co[1] = max(bb_vec[1], max_co[1])
        max_co[2] = max(bb_vec[2], max_co[2])
-        
-        
+
+
 def grid_location(x, y):
    return (x * 200, y * 150)

--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@ -1934,7 +1934,6 @@ class WM_OT_addon_install(Operator):
            try:
                os.makedirs(path_addons, exist_ok=True)
            except:
-                import traceback
                traceback.print_exc()

        # Check if we are installing from a target path,
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@ -47,4 +47,3 @@ class GreasePencilPanel():

            col.label(text="Measure:")
            col.operator("view3d.ruler")
-
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@ -151,6 +151,7 @@ class OBJECT_PT_relations(ObjectButtonsPanel, Panel):
            sub.prop_search(ob, "parent_bone", parent.data, "bones", text="")
        sub.active = (parent is not None)

+
 class GROUP_MT_specials(Menu):
    bl_label = "Group Specials"

--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@ -183,14 +183,10 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal
                    col.template_ID(settings, "clone_image")
                    col.label("UV Map")
                    col.menu("VIEW3D_MT_tools_projectpaint_clone", text=clone_text, translate=False)
-                    
-
        else:
            col.prop(brush, "clone_image", text="Image")
            col.prop(brush, "clone_alpha", text="Alpha")

-
-
    col.separator()

    if capabilities.has_radius:
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@ -260,7 +260,7 @@ class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel):
    def draw(self, context):
        layout = self.layout

-        sc = context.space_data
+        # sc = context.space_data
        # clip = sc.clip

        col = layout.column(align=True)
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@ -215,7 +215,7 @@ class SEQUENCER_MT_select(Menu):
        op = layout.operator("sequencer.select", text="All strips to the Right")
        op.left_right = 'RIGHT'
        op.linked_time = True
-        
+
        layout.separator()
        layout.operator("sequencer.select_handles", text="Surrounding Handles").side = 'BOTH'
        layout.operator("sequencer.select_handles", text="Left Handle").side = 'LEFT'
@ -259,6 +259,7 @@ class SEQUENCER_MT_frame(Menu):
        layout.operator("anim.previewrange_clear")
        layout.operator("anim.previewrange_set")

+
 class SEQUENCER_MT_add(Menu):
    bl_label = "Add"

@ -607,7 +608,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
        col = layout.column(align=True)
        if strip.type == 'SPEED':
            col.prop(strip, "multiply_speed")
-        elif strip.type in {'CROSS', 'GAMMA_CROSS', 'WIPE', 'ALPHA_OVER','ALPHA_UNDER','OVER_DROP'}:
+        elif strip.type in {'CROSS', 'GAMMA_CROSS', 'WIPE', 'ALPHA_OVER', 'ALPHA_UNDER', 'OVER_DROP'}:
            col.prop(strip, "use_default_fade", "Default fade")
            if not strip.use_default_fade:
                col.prop(strip, "effect_fader", text="Effect fader")
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@ -424,7 +424,6 @@ class USERPREF_PT_system(Panel):
        col.prop(system, "use_gpu_mipmap")
        col.prop(system, "use_16bit_textures")

-        
        if system.is_occlusion_query_supported():
            col.separator()
            col.label(text="Selection")
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@ -2198,7 +2198,6 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
        layout = self.layout

        with_freestyle = bpy.app.build_options.freestyle
-        scene = context.scene

        layout.operator_context = 'INVOKE_REGION_WIN'

@ -2254,7 +2253,6 @@ class VIEW3D_MT_edit_mesh_faces(Menu):
        layout = self.layout

        with_freestyle = bpy.app.build_options.freestyle
-        scene = context.scene

        layout.operator_context = 'INVOKE_REGION_WIN'

@ -2951,7 +2949,7 @@ class VIEW3D_PT_view3d_meshdisplay(Panel):

        sub = row.row(align=True)
        sub.active = mesh.show_normal_vertex or mesh.show_normal_face or mesh.show_normal_loop
-        sub.prop(context.scene.tool_settings, "normal_size", text="Size")
+        sub.prop(scene.tool_settings, "normal_size", text="Size")

        col.separator()
        split = layout.split()
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@ -1027,7 +1027,7 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
        col = layout.column()

        col.label("Painting Mode")
-        col.prop(settings, "mode", text = "")
+        col.prop(settings, "mode", text="")
        col.separator()

        if settings.mode == 'MATERIAL':
@ -1064,7 +1064,6 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
        col.operator("image.save_dirty", text="Save All Images")


-
 class VIEW3D_PT_stencil_projectpaint(View3DPanel, Panel):
    bl_context = "imagepaint"
    bl_label = "Stencil"
--- a/release/scripts/templates_py/operator_modal_view3d_raycast.py
+++ b/release/scripts/templates_py/operator_modal_view3d_raycast.py
@ -1,5 +1,4 @@
 import bpy
-from mathutils import Vector
 from bpy_extras import view3d_utils


@ -106,4 +105,3 @@ def unregister():

 if __name__ == "__main__":
    register()
-
--- a/release/scripts/templates_py/script_stub.py
+++ b/release/scripts/templates_py/script_stub.py
@ -11,4 +11,3 @@ filepath = os.path.join(os.path.dirname(bpy.data.filepath), filename)
 global_namespace = {"__file__": filepath, "__name__": "__main__"}
 with open(filepath, 'rb') as file:
    exec(compile(file.read(), filepath, 'exec'), global_namespace)
-
--- a/release/scripts/templates_py/ui_pie_menu.py
+++ b/release/scripts/templates_py/ui_pie_menu.py
@ -29,4 +29,3 @@ if __name__ == "__main__":
    register()

    bpy.ops.wm.call_menu_pie(name="VIEW3D_PIE_template")
-
--- a/source/blender/python/rna_dump.py
+++ b/source/blender/python/rna_dump.py
@ -1,22 +1,22 @@
- # ***** BEGIN GPL LICENSE BLOCK *****
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # Contributor(s): Campbell Barton
- #
- # #**** END GPL LICENSE BLOCK #****
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Campbell Barton
+#
+# ##### END GPL LICENSE BLOCK #####

 # <pep8 compliant>

--- a/tests/python/bl_mesh_modifiers.py
+++ b/tests/python/bl_mesh_modifiers.py
@ -851,7 +851,7 @@ if __name__ == "__main__":
                import traceback
                traceback.print_exc()

-                import sys
+                # import sys
                # sys.exit(1)  # comment to debug

        else: