Code cleanup: style

9 files changed, 75 insertions, 51 deletions

diff --git a/release/scripts/modules/animsys_refactor.py b/release/scripts/modules/animsys_refactor.py
index 9730a05c2d2..8899bbf1ad7 100644
--- a/release/scripts/modules/animsys_refactor.py
+++ b/release/scripts/modules/animsys_refactor.py
@@ -22,7 +22,7 @@
 This module has utility functions for renaming
 rna values in fcurves and drivers.
 
-Currently unused, but might become useful later again. 
+Currently unused, but might become useful later again.
 """
 
 IS_TESTING = False
diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py
index 53146fd0287..85977642bbb 100644
--- a/release/scripts/modules/bl_i18n_utils/utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils.py
@@ -1285,7 +1285,6 @@ class I18n:
                 return path, env[tuple_id]
         return None, None  # No data...
 
-
     def parse(self, kind, src, langs=set()):
         self.parsers[kind](self, src, langs)
 
@@ -1372,6 +1371,7 @@ class I18n:
               ({} currently).
         """.format(self.settings.PARSER_TEMPLATE_ID)
         default_context = self.settings.DEFAULT_CONTEXT
+
         def _gen_py(self, langs, tab="    "):
             _lencomm = len(self.settings.PO_COMMENT_PREFIX)
             _lengen = len(self.settings.PO_COMMENT_PREFIX_GENERATED)
@@ -1451,7 +1451,7 @@ class I18n:
                         ret.append(tab + lngsp + '  "' + comments[-1] + '"))),')
                     else:
                         ret[-1] = ret[-1] + " (" + (('"' + comments[0] + '",') if comments else "") + "))),"
-                    
+
                 ret.append(tab + "),")
             ret += [
                 ")",
diff --git a/release/scripts/modules/bl_i18n_utils/utils_rtl.py b/release/scripts/modules/bl_i18n_utils/utils_rtl.py
index f08d7efdb8e..261d1544ac6 100755
--- a/release/scripts/modules/bl_i18n_utils/utils_rtl.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_rtl.py
@@ -118,7 +118,7 @@ def protect_format_seq(msg):
             dlt = 2
             while (idx + dlt) < ln and msg[idx + dlt] in digits:
                 dlt += 1
-            if (idx + dlt) < ln  and msg[idx + dlt] is '|':
+            if (idx + dlt) < ln and msg[idx + dlt] is '|':
                 dlt += 1
         # %.4f
         elif idx < (ln - 3) and msg[idx] == '%' and msg[idx + 1] in digits:
diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py
index 790233c40af..b1877a9d439 100644
--- a/release/scripts/modules/bpy_extras/io_utils.py
+++ b/release/scripts/modules/bpy_extras/io_utils.py
@@ -409,7 +409,9 @@ def path_reference(filepath,
     if mode == 'ABSOLUTE':
         return filepath_abs
     elif mode == 'RELATIVE':
-        try:  # can't always find the relative path (between drive letters on windows)
+        # can't always find the relative path
+        # (between drive letters on windows)
+        try:
             return os.path.relpath(filepath_abs, base_dst)
         except ValueError:
             return filepath_abs
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index a14f0128444..766da46107b 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -232,7 +232,8 @@ def object_add_grid_scale_apply_operator(operator, context):
         if not properties.is_property_set(prop_id):
             prop_def = properties_def[prop_id]
             if prop_def.unit == 'LENGTH' and prop_def.subtype == 'DISTANCE':
-                setattr(operator, prop_id, getattr(operator, prop_id) * grid_scale)
+                setattr(operator, prop_id,
+                        getattr(operator, prop_id) * grid_scale)
 
 
 def object_image_guess(obj, bm=None):
diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py
index bd895780594..f87cf611dd4 100644
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@ -133,7 +133,7 @@ def write_sysinfo(op):
 
     oiio = bpy.app.oiio
     output.write("OpenImageIO: ")
-    if ocio.supported :
+    if ocio.supported:
         output.write("%s\n" % (oiio.version_string))
     else:
         output.write("Blender was built without OpenImageIO support\n")
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 383f67f8e08..ae13ba8b559 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -938,4 +938,3 @@ class LodGenerate(Operator):
         scene.objects.active = ob
 
         return {'FINISHED'}
-
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 441d314463d..093b7f2cf40 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -63,9 +63,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "use_bone_envelopes", text="Bone Envelopes")
 
         layout.separator()
-        
+
         split = layout.split()
-        
+
         row = split.row(align=True)
         row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
         sub = row.row(align=True)
@@ -139,7 +139,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         elif md.limit_method == 'VGROUP':
             layout.label(text="Vertex Group:")
             layout.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
- 
+
         layout.label(text="Width Method:")
         layout.row().prop(md, "offset_type", expand=True)
 
@@ -262,12 +262,12 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
 
         if decimate_type == 'COLLAPSE':
             layout.prop(md, "ratio")
-            
+
             split = layout.split()
             row = split.row(align=True)
             row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
             row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT')
-            
+
             split.prop(md, "use_collapse_triangulate")
         elif decimate_type == 'UNSUBDIV':
             layout.prop(md, "iterations")
@@ -464,10 +464,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.active = not md.is_bound
         col.label(text="Object:")
         col.prop(md, "object", text="")
-        
+
         col = split.column()
         col.label(text="Vertex Group:")
-        
+
         row = col.row(align=True)
         row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
         sub = row.row(align=True)
@@ -792,18 +792,18 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col = split.column()
         col.prop(md, "thickness")
         col.prop(md, "thickness_clamp")
-        
+
         col.separator()
-        
+
         row = col.row(align=True)
         row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
         sub = row.row(align=True)
         sub.active = bool(md.vertex_group)
         sub.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT')
-        
+
         sub = col.row()
         sub.active = bool(md.vertex_group)
-        sub.prop(md, "thickness_vertex_group", text="Factor") 
+        sub.prop(md, "thickness_vertex_group", text="Factor")
 
         col.label(text="Crease:")
         col.prop(md, "edge_crease_inner", text="Inner")
@@ -818,11 +818,11 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "use_even_offset")
         col.prop(md, "use_quality_normals")
         col.prop(md, "use_rim")
-        
+
         col.separator()
-        
+
         col.label(text="Material Index Offset:")
-        
+
         sub = col.column()
         row = sub.split(align=True, percentage=0.4)
         row.prop(md, "material_offset", text="")
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 3ae4330249a..039179afc8e 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -40,6 +40,7 @@ def draw_repeat_tools(context, layout):
     col.operator("screen.repeat_last")
     col.operator("screen.repeat_history", text="History...")
 
+
 # Keyframing tools
 def draw_keyframing_tools(context, layout):
     col = layout.column(align=True)
@@ -48,6 +49,7 @@ def draw_keyframing_tools(context, layout):
     row.operator("anim.keyframe_insert_menu", text="Insert")
     row.operator("anim.keyframe_delete_v3d", text="Remove")
 
+
 # Grease Pencil tools
 def draw_gpencil_tools(context, layout):
     col = layout.column(align=True)
@@ -60,16 +62,17 @@ def draw_gpencil_tools(context, layout):
     row.operator("gpencil.draw", text="Erase").mode = 'ERASER'
 
     col.separator()
-    
+
     col.prop(context.tool_settings, "use_grease_pencil_sessions")
 
     col.separator()
-    
+
     col.label(text="Measure:")
     col.operator("view3d.ruler")
 
 # ********** default tools for object-mode ****************
 
+
 class VIEW3D_PT_tools_transform(View3DPanel, Panel):
     bl_category = "Tools"
     bl_context = "objectmode"
@@ -89,6 +92,7 @@ class VIEW3D_PT_tools_transform(View3DPanel, Panel):
             col = layout.column(align=True)
             col.operator("transform.mirror", text="Mirror")
 
+
 class VIEW3D_PT_tools_object(View3DPanel, Panel):
     bl_category = "Tools"
     bl_context = "objectmode"
@@ -119,6 +123,7 @@ class VIEW3D_PT_tools_object(View3DPanel, Panel):
             row.operator("object.shade_smooth", text="Smooth")
             row.operator("object.shade_flat", text="Flat")
 
+
 class VIEW3D_PT_tools_objectmode(View3DPanel, Panel):
     bl_category = "Tools"
     bl_context = "objectmode"
@@ -136,14 +141,15 @@ class VIEW3D_PT_tools_objectmode(View3DPanel, Panel):
 
         draw_repeat_tools(context, layout)
 
+
 class VIEW3D_PT_tools_add_mesh(View3DPanel, Panel):
     bl_category = "Create"
     bl_context = "objectmode"
     bl_label = "Add Primitive"
-    
-    def draw (self, context):
+
+    def draw(self, context):
         layout = self.layout
-        
+
         col = layout.column(align=True)
         col.label(text="Mesh:")
         col.operator("mesh.primitive_plane_add", text="Plane", icon="MESH_PLANE")
@@ -154,28 +160,29 @@ class VIEW3D_PT_tools_add_mesh(View3DPanel, Panel):
         col.operator("mesh.primitive_cylinder_add", text="Cylinder", icon="MESH_CYLINDER")
         col.operator("mesh.primitive_cone_add", text="Cone", icon="MESH_CONE")
         col.operator("mesh.primitive_torus_add", text="Torus", icon="MESH_TORUS")
-        col.operator("mesh.primitive_monkey_add", text="Monkey", icon="MESH_MONKEY")   
-        
+        col.operator("mesh.primitive_monkey_add", text="Monkey", icon="MESH_MONKEY")
+
         col = layout.column(align=True)
         col.label(text="Curve:")
         col.operator("curve.primitive_bezier_curve_add", text="Curve", icon="CURVE_BEZCURVE")
         col.operator("curve.primitive_bezier_circle_add", text="Circle", icon="CURVE_BEZCIRCLE")
-        col.operator("curve.primitive_nurbs_path_add", text="Path" , icon="CURVE_PATH")
+        col.operator("curve.primitive_nurbs_path_add", text="Path", icon="CURVE_PATH")
 
         col.label(text="Lamp:")
-        col.operator("object.lamp_add", text="Point", icon="LAMP_POINT").type='POINT'
-        col.operator("object.lamp_add", text="Sun", icon="LAMP_SUN").type='SUN'
-        col.operator("object.lamp_add", text="Spot", icon="LAMP_SPOT").type='SPOT'
-        col.operator("object.lamp_add", text="Hemi", icon="LAMP_HEMI").type='HEMI'
-        col.operator("object.lamp_add", text="Area", icon="LAMP_AREA").type='AREA'
-              
+        col.operator("object.lamp_add", text="Point", icon="LAMP_POINT").type = 'POINT'
+        col.operator("object.lamp_add", text="Sun", icon="LAMP_SUN").type = 'SUN'
+        col.operator("object.lamp_add", text="Spot", icon="LAMP_SPOT").type = 'SPOT'
+        col.operator("object.lamp_add", text="Hemi", icon="LAMP_HEMI").type = 'HEMI'
+        col.operator("object.lamp_add", text="Area", icon="LAMP_AREA").type = 'AREA'
+
         col.label(text="Other:")
-        col.operator("object.text_add", text="Text", icon ="OUTLINER_OB_FONT")
-        col.operator("object.armature_add",text="Armature", icon="OUTLINER_OB_ARMATURE")
-        col.operator("object.add", text="Lattice", icon="OUTLINER_OB_LATTICE").type='LATTICE'
-        col.operator("object.empty_add", text="Empty", icon="OUTLINER_OB_EMPTY").type='PLAIN_AXES'
+        col.operator("object.text_add", text="Text", icon="OUTLINER_OB_FONT")
+        col.operator("object.armature_add", text="Armature", icon="OUTLINER_OB_ARMATURE")
+        col.operator("object.add", text="Lattice", icon="OUTLINER_OB_LATTICE").type = 'LATTICE'
+        col.operator("object.empty_add", text="Empty", icon="OUTLINER_OB_EMPTY").type = 'PLAIN_AXES'
         col.operator("object.camera_add", text="Camera", icon="OUTLINER_OB_CAMERA")
 
+
 class VIEW3D_PT_tools_relations(View3DPanel, Panel):
     bl_category = "Relations"
     bl_context = "objectmode"
@@ -190,26 +197,27 @@ class VIEW3D_PT_tools_relations(View3DPanel, Panel):
         col.operator("group.create", text="New Group")
         col.operator("group.objects_add_active", text="Add to Active")
         col.operator("group.objects_remove", text="Remove from Group")
-        
+
         col.separator()
-        
+
         col.label(text="Parent:")
         row = col.row(align=True)
         row.operator("object.parent_set", text="Set")
         row.operator("object.parent_clear", text="Clear")
 
         col.separator()
-        
+
         col.label(text="Object Data:")
         col.operator("object.make_links_data")
         col.operator("object.make_single_user")
-        
+
         col.separator()
 
         col.label(text="Linked Objects:")
         col.operator("object.make_local")
         col.operator("object.proxy_make")
 
+
 class VIEW3D_PT_tools_animation(View3DPanel, Panel):
     bl_category = "Animation"
     bl_context = "objectmode"
@@ -231,6 +239,7 @@ class VIEW3D_PT_tools_animation(View3DPanel, Panel):
         col.label(text="Action:")
         col.operator("nla.bake", text="Bake Action")
 
+
 class VIEW3D_PT_tools_rigidbody(View3DPanel, Panel):
     bl_category = "Physics"
     bl_context = "objectmode"
@@ -275,6 +284,7 @@ class VIEW3D_PT_tools_transform_mesh(View3DPanel, Panel):
         col.operator("transform.shrink_fatten", text="Shrink/Fatten")
         col.operator("transform.push_pull", text="Push/Pull")
 
+
 class VIEW3D_PT_tools_meshedit(View3DPanel, Panel):
     bl_category = "Tools"
     bl_context = "mesh_edit"
@@ -322,12 +332,13 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, Panel):
 
         draw_repeat_tools(context, layout)
 
+
 class VIEW3D_PT_tools_add_mesh_edit(View3DPanel, Panel):
     bl_category = "Create"
     bl_context = "mesh_edit"
     bl_label = "Add Meshes"
 
-    def draw (self, context):
+    def draw(self, context):
         layout = self.layout
 
         col = layout.column(align=True)
@@ -346,6 +357,7 @@ class VIEW3D_PT_tools_add_mesh_edit(View3DPanel, Panel):
         col.operator("mesh.primitive_grid_add", text="Grid", icon="MESH_GRID")
         col.operator("mesh.primitive_monkey_add", text="Monkey", icon="MESH_MONKEY")
 
+
 class VIEW3D_PT_tools_shading(View3DPanel, Panel):
     bl_category = "Shading / UVs"
     bl_context = "mesh_edit"
@@ -370,6 +382,7 @@ class VIEW3D_PT_tools_uvs(View3DPanel, Panel):
     bl_category = "Shading / UVs"
     bl_context = "mesh_edit"
     bl_label = "UVs"
+
     def draw(self, context):
         layout = self.layout
 
@@ -378,7 +391,7 @@ class VIEW3D_PT_tools_uvs(View3DPanel, Panel):
         col.menu("VIEW3D_MT_uv_map", text="Unwrap")
         col.operator("mesh.mark_seam").clear = False
         col.operator("mesh.mark_seam", text="Clear Seam").clear = True
-        
+
 
 class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
     bl_category = "Options"
@@ -417,6 +430,7 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
 
 # ********** default tools for editmode_curve ****************
 
+
 class VIEW3D_PT_tools_transform_curve(View3DPanel, Panel):
     bl_category = "Tools"
     bl_context = "curve_edit"
@@ -434,6 +448,7 @@ class VIEW3D_PT_tools_transform_curve(View3DPanel, Panel):
         col.operator("transform.tilt", text="Tilt")
         col.operator("transform.transform", text="Scale Feather").mode = 'CURVE_SHRINKFATTEN'
 
+
 class VIEW3D_PT_tools_curveedit(View3DPanel, Panel):
     bl_category = "Tools"
     bl_context = "curve_edit"
@@ -471,12 +486,13 @@ class VIEW3D_PT_tools_curveedit(View3DPanel, Panel):
 
         draw_repeat_tools(context, layout)
 
+
 class VIEW3D_PT_tools_add_curve_edit(View3DPanel, Panel):
     bl_category = "Create"
     bl_context = "curve_edit"
     bl_label = "Add Curves"
 
-    def draw (self, context):
+    def draw(self, context):
         layout = self.layout
 
         col = layout.column(align=True)
@@ -488,10 +504,11 @@ class VIEW3D_PT_tools_add_curve_edit(View3DPanel, Panel):
         col.label(text="Nurbs:")
         col.operator("curve.primitive_nurbs_curve_add", text="Nurbs Curve", icon="CURVE_NCURVE")
         col.operator("curve.primitive_nurbs_circle_add", text="Nurbs Circle", icon="CURVE_NCIRCLE")
-        col.operator("curve.primitive_nurbs_path_add", text="Nurbs Path" , icon="CURVE_PATH")
+        col.operator("curve.primitive_nurbs_path_add", text="Nurbs Path", icon="CURVE_PATH")
 
 # ********** default tools for editmode_surface ****************
 
+
 class VIEW3D_PT_tools_transform_surface(View3DPanel, Panel):
     bl_category = "Tools"
     bl_context = "surface_edit"
@@ -505,6 +522,7 @@ class VIEW3D_PT_tools_transform_surface(View3DPanel, Panel):
         col.operator("transform.rotate")
         col.operator("transform.resize", text="Scale")
 
+
 class VIEW3D_PT_tools_surfaceedit(View3DPanel, Panel):
     bl_category = "Tools"
     bl_context = "surface_edit"
@@ -527,12 +545,13 @@ class VIEW3D_PT_tools_surfaceedit(View3DPanel, Panel):
 
         draw_repeat_tools(context, layout)
 
+
 class VIEW3D_PT_tools_add_surface_edit(View3DPanel, Panel):
     bl_category = "Create"
     bl_context = "surface_edit"
     bl_label = "Add Surfaces"
 
-    def draw (self, context):
+    def draw(self, context):
         layout = self.layout
 
         col = layout.column(align=True)
@@ -628,12 +647,13 @@ class VIEW3D_PT_tools_mballedit(View3DPanel, Panel):
 
         draw_repeat_tools(context, layout)
 
+
 class VIEW3D_PT_tools_add_mball_edit(View3DPanel, Panel):
     bl_category = "Create"
     bl_context = "mball_edit"
     bl_label = "Add Metaball"
 
-    def draw (self, context):
+    def draw(self, context):
         layout = self.layout
 
         col = layout.column(align=True)
@@ -1283,12 +1303,13 @@ class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel):
         layout.prop(sculpt, "use_symmetry_feather", text="Feather")
 
         layout.label(text="Lock:")
-        
+
         row = layout.row(align=True)
         row.prop(sculpt, "lock_x", text="X", toggle=True)
         row.prop(sculpt, "lock_y", text="Y", toggle=True)
         row.prop(sculpt, "lock_z", text="Z", toggle=True)
 
+
 class VIEW3D_PT_tools_brush_appearance(Panel, View3DPaintPanel):
     bl_category = "Options"
     bl_label = "Appearance"
@@ -1591,6 +1612,7 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, Panel):
             sub.active = pe.use_fade_time
             sub.prop(pe, "fade_frames", slider=True)
 
+
 # Grease Pencil tools
 class VIEW3D_PT_tools_greasepencil(View3DPanel, Panel):
     bl_category = "Grease Pencil"