style cleanup

13 files changed, 64 insertions, 54 deletions

diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py
index 0f09893647a..e6d9affee93 100644
--- a/release/scripts/startup/bl_ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -120,13 +120,13 @@ class BONE_PT_transform_locks(BoneButtonsPanel, Panel):
         pchan = ob.pose.bones[bone.name]
 
         split = layout.split(percentage=0.1)
-        
+
         col = split.column(align=True)
         col.label(text="")
         col.label(text="X:")
         col.label(text="Y:")
         col.label(text="Z:")
-        
+
         col = split.row()
         sub = col.row()
         sub.active = not (bone.parent and bone.use_connect)
@@ -137,7 +137,7 @@ class BONE_PT_transform_locks(BoneButtonsPanel, Panel):
         if pchan.rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
             row = layout.row()
             row.prop(pchan, "lock_rotations_4d", text="Lock Rotation")
-            
+
             sub = row.row()
             sub.active = pchan.lock_rotations_4d
             sub.prop(pchan, "lock_rotation_w", text="W")
diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py
index 6a7415f7cec..87ac56c1104 100644
--- a/release/scripts/startup/bl_ui/properties_data_curve.py
+++ b/release/scripts/startup/bl_ui/properties_data_curve.py
@@ -406,7 +406,7 @@ class DATA_PT_text_boxes(CurveButtonsPanel, Panel):
             col.prop(box, "x", text="X")
             col.prop(box, "y", text="Y")
 
-            row.operator("font.textbox_remove", text='', icon='X', emboss=False).index = i
+            row.operator("font.textbox_remove", text="", icon='X', emboss=False).index = i
 
 
 class DATA_PT_custom_props_curve(CurveButtonsPanel, PropertyPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 2e980f776a1..abcd27c308e 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -969,7 +969,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
 
         layout.label(text="Selected Vertices:")
         split = layout.split()
-        
+
         col = split.column(align=True)
         col.operator("object.skin_loose_mark_clear", text="Mark Loose").action = "MARK"
         col.operator("object.skin_loose_mark_clear", text="Clear Loose").action = "CLEAR"
@@ -983,6 +983,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "use_x_symmetry")
         col.prop(md, "use_y_symmetry")
         col.prop(md, "use_z_symmetry")
-        
+
 if __name__ == "__main__":  # only for live edit.
     bpy.utils.register_module(__name__)
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 87c62e2791f..3c30f27f16b 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -105,13 +105,13 @@ class OBJECT_PT_transform_locks(ObjectButtonsPanel, Panel):
         ob = context.object
 
         split = layout.split(percentage=0.1)
-        
+
         col = split.column(align=True)
         col.label(text="")
         col.label(text="X:")
         col.label(text="Y:")
         col.label(text="Z:")
-        
+
         col = split.row()
         col.column().prop(ob, "lock_location", text="Location")
         col.column().prop(ob, "lock_rotation", text="Rotation")
@@ -120,7 +120,7 @@ class OBJECT_PT_transform_locks(ObjectButtonsPanel, Panel):
         if ob.rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
             row = layout.row()
             row.prop(ob, "lock_rotations_4d", text="Lock Rotation")
-            
+
             sub = row.row()
             sub.active = ob.lock_rotations_4d
             sub.prop(ob, "lock_rotation_w", text="W")
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 9dc6c62a9e0..1ed3638080a 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -526,7 +526,7 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel):
         if ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG'}:
             split.prop(ffmpeg, "codec")
         elif rd.ffmpeg.format == 'H264':
-            split.prop(ffmpeg, 'use_lossless_output')
+            split.prop(ffmpeg, "use_lossless_output")
         else:
             split.label()
 
@@ -575,7 +575,7 @@ class RENDER_PT_bake(RenderButtonsPanel, Panel):
 
         multires_bake = False
         if rd.bake_type in ['NORMALS', 'DISPLACEMENT']:
-            layout.prop(rd, 'use_bake_multires')
+            layout.prop(rd, "use_bake_multires")
             multires_bake = rd.use_bake_multires
 
         if not multires_bake:
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index af8fcc6cbdc..c9c9c36217b 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -165,7 +165,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel):
             row.label(text="Array Target:")
             row.prop(ksp, "use_entire_array", text="All Items")
             if ksp.use_entire_array:
-                row.label(text=" ") # padding
+                row.label(text=" ")  # padding
             else:
                 row.prop(ksp, "array_index", text="Index")
 
@@ -177,7 +177,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel):
             col.prop(ksp, "group_method", text="")
             if ksp.group_method == 'NAMED':
                 col.prop(ksp, "group")
-            
+
             col = row.column(align=True)
             col.label(text="Keyframing Settings:")
             col.prop(ksp, "bl_options")
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index a77302ff4ae..579d44c2355 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -48,7 +48,7 @@ class CLIP_HT_header(Header):
                     sub.menu("CLIP_MT_clip")
 
         row = layout.row()
-        row.template_ID(sc, "clip", open='clip.open')
+        row.template_ID(sc, "clip", open="clip.open")
 
         if clip:
             tracking = clip.tracking
@@ -95,7 +95,8 @@ class CLIP_HT_header(Header):
 
                 row = layout.row(align=True)
                 row.prop(dopesheet, "sort_method", text="")
-                row.prop(dopesheet, "use_invert_sort", text="Invert", toggle=True)
+                row.prop(dopesheet, "use_invert_sort",
+                         text="Invert", toggle=True)
         else:
             layout.prop(sc, "view", text="", expand=True)
 
@@ -121,7 +122,7 @@ class CLIP_HT_header(Header):
                 sub.menu("CLIP_MT_clip")
 
         row = layout.row()
-        row.template_ID(sc, "clip", open='clip.open')
+        row.template_ID(sc, "clip", open="clip.open")
 
         layout.prop(sc, "mode", text="")
 
@@ -255,7 +256,7 @@ class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel):
             col.prop(settings, "default_pattern_match", text="")
 
             col.separator()
-            col.operator('clip.track_settings_as_default',
+            col.operator("clip.track_settings_as_default",
                          text="Copy From Active Track")
 
 
@@ -340,9 +341,9 @@ class CLIP_PT_tools_cleanup(CLIP_PT_tracking_panel, Panel):
 
         layout.operator("clip.clean_tracks")
 
-        layout.prop(settings, 'clean_frames', text="Frames")
-        layout.prop(settings, 'clean_error', text="Error")
-        layout.prop(settings, 'clean_action', text="")
+        layout.prop(settings, "clean_frames", text="Frames")
+        layout.prop(settings, "clean_error", text="Error")
+        layout.prop(settings, "clean_action", text="")
 
 
 class CLIP_PT_tools_geometry(CLIP_PT_reconstruction_panel, Panel):
@@ -553,7 +554,8 @@ class CLIP_PT_track(CLIP_PT_tracking_panel, Panel):
 
         row.separator()
         sub = row.row()
-        sub.prop(act_track, "use_alpha_preview", text="", toggle=True, icon='IMAGE_ALPHA')
+        sub.prop(act_track, "use_alpha_preview",
+                 text="", toggle=True, icon='IMAGE_ALPHA')
 
         layout.separator()
 
@@ -735,7 +737,9 @@ class CLIP_PT_active_mask_point(Panel):
         mask = sc.mask
 
         if mask and sc.mode == 'MASKEDIT':
-            return mask.layers.active and mask.layers.active.splines.active_point
+            mask_layer_active = mask.layers.active
+            return (mask_layer_active and
+                    mask_layer_active.splines.active_point)
 
         return False
 
@@ -979,7 +983,7 @@ class CLIP_PT_proxy(CLIP_PT_clip_view_panel, Panel):
 
         layout.prop(clip.proxy, "quality")
 
-        layout.prop(clip, 'use_proxy_custom_directory')
+        layout.prop(clip, "use_proxy_custom_directory")
         if clip.use_proxy_custom_directory:
             layout.prop(clip.proxy, "directory")
 
@@ -1053,7 +1057,8 @@ class CLIP_MT_view(Menu):
 
             for a, b in ratios:
                 text = "Zoom %d:%d" % (a, b)
-                layout.operator("clip.view_zoom_ratio", text=text).ratio = a / b
+                layout.operator("clip.view_zoom_ratio",
+                                text=text).ratio = a / b
         else:
             layout.prop(sc, "show_seconds")
             layout.separator()
@@ -1203,16 +1208,20 @@ class CLIP_MT_select(Menu):
 
             layout.separator()
 
-            layout.operator("mask.select_all").action = 'TOGGLE'
-            layout.operator("mask.select_all", text="Inverse").action = 'INVERT'
+            layout.operator("mask.select_all"
+                            ).action = 'TOGGLE'
+            layout.operator("mask.select_all",
+                            text="Inverse").action = 'INVERT'
         else:
             layout.operator("clip.select_border")
             layout.operator("clip.select_circle")
 
             layout.separator()
 
-            layout.operator("clip.select_all").action = 'TOGGLE'
-            layout.operator("clip.select_all", text="Inverse").action = 'INVERT'
+            layout.operator("clip.select_all"
+                            ).action = 'TOGGLE'
+            layout.operator("clip.select_all",
+                            text="Inverse").action = 'INVERT'
 
             layout.menu("CLIP_MT_select_grouped")
 
@@ -1349,7 +1358,7 @@ class CLIP_MT_track_color_specials(Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator('clip.track_copy_color', icon='COPY_ID')
+        layout.operator("clip.track_copy_color", icon='COPY_ID')
 
 
 class CLIP_MT_stabilize_2d_specials(Menu):
@@ -1358,7 +1367,7 @@ class CLIP_MT_stabilize_2d_specials(Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator('clip.stabilize_2d_select')
+        layout.operator("clip.stabilize_2d_select")
 
 if __name__ == "__main__":  # only for live edit.
     bpy.utils.register_module(__name__)
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index 9cf4a337483..8ddb2df352a 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -371,16 +371,16 @@ class INFO_MT_help(Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("wm.url_open", text="Manual", icon='HELP').url = 'http://wiki.blender.org/index.php/Doc:2.6/Manual'
-        layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-263/'
+        layout.operator("wm.url_open", text="Manual", icon='HELP').url = "http://wiki.blender.org/index.php/Doc:2.6/Manual"
+        layout.operator("wm.url_open", text="Release Log", icon='URL').url = "http://www.blender.org/development/release-logs/blender-263"
         layout.separator()
 
-        layout.operator("wm.url_open", text="Blender Website", icon='URL').url = 'http://www.blender.org/'
-        layout.operator("wm.url_open", text="Blender e-Shop", icon='URL').url = 'http://www.blender.org/e-shop'
-        layout.operator("wm.url_open", text="Developer Community", icon='URL').url = 'http://www.blender.org/community/get-involved/'
-        layout.operator("wm.url_open", text="User Community", icon='URL').url = 'http://www.blender.org/community/user-community/'
+        layout.operator("wm.url_open", text="Blender Website", icon='URL').url = "http://www.blender.org"
+        layout.operator("wm.url_open", text="Blender e-Shop", icon='URL').url = "http://www.blender.org/e-shop"
+        layout.operator("wm.url_open", text="Developer Community", icon='URL').url = "http://www.blender.org/community/get-involved"
+        layout.operator("wm.url_open", text="User Community", icon='URL').url = "http://www.blender.org/community/user-community"
         layout.separator()
-        layout.operator("wm.url_open", text="Report a Bug", icon='URL').url = 'http://projects.blender.org/tracker/?atid=498&group_id=9&func=browse'
+        layout.operator("wm.url_open", text="Report a Bug", icon='URL').url = "http://projects.blender.org/tracker/?atid=498&group_id=9&func=browse"
         layout.separator()
 
         layout.operator("wm.url_open", text="Python API Reference", icon='URL').url = bpy.types.WM_OT_doc_view._prefix
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index b4100819ab0..70f0f300f86 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -205,6 +205,7 @@ class NODE_PT_properties(Panel):
         col.prop(snode, "backdrop_y", text="Y")
         col.operator("node.backimage_move", text="Move")
 
+
 class NODE_PT_quality(bpy.types.Panel):
     bl_space_type = 'NODE_EDITOR'
     bl_region_type = 'UI'
@@ -225,7 +226,7 @@ class NODE_PT_quality(bpy.types.Panel):
         layout.prop(tree, "chunk_size")
         layout.prop(tree, "use_opencl")
 
-        
+
 class NODE_MT_node_color_presets(Menu):
     """Predefined node color"""
     bl_label = "Color Presets"
@@ -240,8 +241,8 @@ class NODE_MT_node_color_specials(Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator('node.node_copy_color', icon='COPY_ID')
+        layout.operator("node.node_copy_color", icon='COPY_ID')
+
 
-        
 if __name__ == "__main__":  # only for live edit.
     bpy.utils.register_module(__name__)
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 276e8e5ae1d..34168c07073 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -352,7 +352,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, Panel):
 
     def draw(self, context):
         layout = self.layout
-        
+
         scene = context.scene
         frame_current = scene.frame_current
         strip = act_strip(context)
@@ -474,7 +474,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
         elif strip.type == 'TRANSFORM':
             layout = self.layout
             col = layout.column()
-    
+
             col.prop(strip, "interpolation")
             col.prop(strip, "translation_unit")
             col = layout.column(align=True)
@@ -483,7 +483,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
             col.prop(strip, "translate_start_y", text="Y")
 
             layout.separator()
-    
+
             col = layout.column(align=True)
             col.prop(strip, "use_uniform_scale")
             if (strip.use_uniform_scale):
@@ -568,10 +568,10 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, Panel):
             split = layout.split(percentage=0.2)
             split.label(text="Path:")
             split.prop(strip, "filepath", text="")
-            
+
             layout.prop(strip, "mpeg_preseek")
             layout.prop(strip, "stream_index")
-        
+
         layout.prop(strip, "use_translation", text="Image Offset")
         if strip.use_translation:
             col = layout.column(align=True)
@@ -740,13 +740,13 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel):
             col = layout.column()
             col.label(text="Distortion:")
             col.prop(strip, "undistort")
-            
+
         split = layout.split(percentage=0.65)
 
         col = split.column()
         col.prop(strip, "use_reverse_frames", text="Backwards")
         col.prop(strip, "use_deinterlace")
-        
+
         col = split.column()
         col.label(text="Flip:")
         col.prop(strip, "use_flip_x", text="X")
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 2d349931dc4..7a147bac38c 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -245,7 +245,7 @@ class USERPREF_PT_interface(Panel):
 
         col.prop(view, "show_splash")
 
-        if os.name == 'nt':
+        if os.name == "nt":
             col.prop(view, "quit_dialog")
 
 
@@ -419,7 +419,7 @@ class USERPREF_PT_system(Panel):
         col.separator()
         col.separator()
 
-        if hasattr(system, 'compute_device'):
+        if hasattr(system, "compute_device"):
             col.label(text="Compute Device:")
             col.row().prop(system, "compute_device_type", expand=True)
             sub = col.row()
@@ -1094,7 +1094,7 @@ class USERPREF_PT_addons(Panel):
 
                 rowsub = row.row()
                 rowsub.active = is_enabled
-                rowsub.label(text='%s: %s' % (info['category'], info["name"]))
+                rowsub.label(text='%s: %s' % (info["category"], info["name"]))
                 if info["warning"]:
                     rowsub.label(icon='ERROR')
 
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index b525ab922d2..660829f4f40 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2391,7 +2391,7 @@ class VIEW3D_PT_view3d_display(Panel):
             col.prop(gs, "material_mode", text="")
             col.prop(view, "show_textured_solid")
 
-        col.prop(view, "show_backface_culling")            
+        col.prop(view, "show_backface_culling")
 
         layout.separator()
 
@@ -2556,7 +2556,7 @@ class VIEW3D_PT_background_image(Panel):
                         has_bg = True
 
                 elif bg.source == 'MOVIE_CLIP':
-                    box.prop(bg, 'use_camera_clip')
+                    box.prop(bg, "use_camera_clip")
 
                     column = box.column()
                     column.active = not bg.use_camera_clip
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index a1f616cc237..afffa054a1e 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -987,7 +987,7 @@ class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel):
             col.prop(mesh, "use_mirror_topology")
 
         col.prop(wpaint, "input_samples")
-        
+
         self.unified_paint_settings(col, context)
 
 # Commented out because the Apply button isn't an operator yet, making these settings useless
@@ -1138,7 +1138,7 @@ class VIEW3D_MT_tools_projectpaint_stencil(Menu):
 
 
 class VIEW3D_PT_tools_particlemode(View3DPanel, Panel):
-    '''default tools for particle mode'''
+    """default tools for particle mode"""
     bl_context = "particlemode"
     bl_label = "Options"