[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55184] trunk/blender: code cleanup: pep8 & minor changes
Campbell Barton
ideasman42 at gmail.com
Mon Mar 11 03:19:59 CET 2013
Revision: 55184
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55184
Author: campbellbarton
Date: 2013-03-11 02:19:58 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
code cleanup: pep8 & minor changes
Modified Paths:
--------------
trunk/blender/release/scripts/modules/console/complete_import.py
trunk/blender/release/scripts/presets/keyconfig/3dsmax.py
trunk/blender/release/scripts/startup/bl_ui/properties_constraint.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
Modified: trunk/blender/release/scripts/modules/console/complete_import.py
===================================================================
--- trunk/blender/release/scripts/modules/console/complete_import.py 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/release/scripts/modules/console/complete_import.py 2013-03-11 02:19:58 UTC (rev 55184)
@@ -111,10 +111,10 @@
else:
folder_list = []
#folder_list = glob.glob(os.path.join(path,'*'))
- folder_list = [p for p in folder_list \
- if os.path.exists(os.path.join(path, p, '__init__.py'))\
- or p[-3:] in ('.py', '.so')\
- or p[-4:] in ('.pyc', '.pyo', '.pyd')]
+ folder_list = [p for p in folder_list \
+ if os.path.exists(os.path.join(path, p, '__init__.py')) \
+ or p[-3:] in {'.py', '.so'} \
+ or p[-4:] in {'.pyc', '.pyo', '.pyd'}]
folder_list = [os.path.basename(p).split('.')[0] for p in folder_list]
return folder_list
Modified: trunk/blender/release/scripts/presets/keyconfig/3dsmax.py
===================================================================
--- trunk/blender/release/scripts/presets/keyconfig/3dsmax.py 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/release/scripts/presets/keyconfig/3dsmax.py 2013-03-11 02:19:58 UTC (rev 55184)
@@ -1357,4 +1357,3 @@
kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_DOWN', 'PAGE_DOWN', 'PRESS', shift=True)
kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_UP', 'WHEELDOWNMOUSE', 'PRESS', shift=True)
kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_DOWN', 'WHEELUPMOUSE', 'PRESS', shift=True)
-
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_constraint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_constraint.py 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_constraint.py 2013-03-11 02:19:58 UTC (rev 55184)
@@ -851,16 +851,16 @@
def draw(self, context):
layout = self.layout
- ob = context.object
+ obj = context.object
- if ob.type == 'ARMATURE' and ob.mode in ('EDIT', 'POSE'):
+ if obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'}:
box = layout.box()
box.alert = True
box.label(icon='INFO', text="See Bone Constraints tab to Add Constraints to active bone")
else:
layout.operator_menu_enum("object.constraint_add", "type", text="Add Object Constraint")
- for con in ob.constraints:
+ for con in obj.constraints:
self.draw_constraint(context, con)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py 2013-03-11 02:19:58 UTC (rev 55184)
@@ -109,7 +109,7 @@
#col = layout.column(align=1)
#col.label(text="Activation:")
- # XXX: settings such as activate on collison/etc.
+ # XXX: settings such as activate on collison/etc.
split = layout.split()
Modified: trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py 2013-03-11 02:19:58 UTC (rev 55184)
@@ -36,7 +36,7 @@
if is_nla:
row.prop(dopesheet, "show_missing_nla", text="")
- else: # graph and dopesheet editors - F-Curves and drivers only
+ else: # graph and dopesheet editors - F-Curves and drivers only
row.prop(dopesheet, "show_only_errors", text="")
if not genericFiltersOnly:
Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py 2013-03-11 02:19:58 UTC (rev 55184)
@@ -699,11 +699,11 @@
row = col.row(align=True)
if(brush.use_relative_jitter):
- row.prop(brush, "use_relative_jitter", text="", icon='LOCKED')
- row.prop(brush, "jitter", slider=True)
+ row.prop(brush, "use_relative_jitter", text="", icon='LOCKED')
+ row.prop(brush, "jitter", slider=True)
else:
- row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
- row.prop(brush, "jitter_absolute")
+ row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
+ row.prop(brush, "jitter_absolute")
row.prop(brush, "use_pressure_jitter", toggle=True, text="")
col.prop(brush, "blend", text="Blend")
@@ -726,7 +726,7 @@
col = layout.column()
col.template_ID_preview(brush, "texture", new="texture.new", rows=3, cols=8)
-
+
brush_texture_settings(col, brush, 0)
Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py 2013-03-11 02:19:58 UTC (rev 55184)
@@ -215,13 +215,13 @@
_EVENT_TYPES = set()
_EVENT_TYPE_MAP = {}
+
def draw_filtered(self, display_keymaps, filter_type, filter_text, layout):
if filter_type == 'NAME':
def filter_func(kmi):
return (filter_text in kmi.idname.lower() or
filter_text in kmi.name.lower())
-
else:
if not self._EVENT_TYPES:
enum = bpy.types.Event.bl_rna.properties["type"].enum_items
@@ -272,13 +272,13 @@
return False
elif filter_text_split:
kmi_type = filter_text_split[0].upper()
-
+
if kmi_type not in self._EVENT_TYPES:
# replacement table
kmi_type_test = self._EVENT_TYPE_MAP.get(kmi_type)
if kmi_type_test is None:
# print("Unknown Type:", kmi_type)
-
+
# Partial match
for k, v in self._EVENT_TYPE_MAP.items():
if kmi_type in k:
@@ -293,7 +293,7 @@
kmi_type = kmi_type_test
del kmi_type_test
-
+
kmi_test_dict["type"] = kmi_type
# main filter func, runs many times
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-03-11 02:19:58 UTC (rev 55184)
@@ -2520,29 +2520,29 @@
mesh = context.active_object.data
split = layout.split()
-
+
col = split.column()
col.label(text="Overlays:")
col.prop(mesh, "show_faces", text="Faces")
col.prop(mesh, "show_edges", text="Edges")
col.prop(mesh, "show_edge_crease", text="Creases")
-
+
col = split.column()
col.label()
col.prop(mesh, "show_edge_seams", text="Seams")
col.prop(mesh, "show_edge_sharp", text="Sharp")
col.prop(mesh, "show_edge_bevel_weight", text="Weights")
-
+
col = layout.column()
col.separator()
col.label(text="Normals:")
row = col.row()
-
+
sub = row.row(align=True)
sub.prop(mesh, "show_normal_vertex", text="", icon='VERTEXSEL')
sub.prop(mesh, "show_normal_face", text="", icon='FACESEL')
-
+
sub = row.row(align=True)
sub.active = mesh.show_normal_vertex or mesh.show_normal_face
sub.prop(context.scene.tool_settings, "normal_size", text="Size")
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-03-11 02:19:58 UTC (rev 55184)
@@ -685,7 +685,7 @@
row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
row.prop(brush, "jitter_absolute")
row.prop(brush, "use_pressure_jitter", toggle=True, text="")
-
+
col.prop(brush, "blend", text="Blend")
col = layout.column()
@@ -712,11 +712,11 @@
row = col.row(align=True)
if(brush.use_relative_jitter):
- row.prop(brush, "use_relative_jitter", text="", icon='LOCKED')
- row.prop(brush, "jitter", slider=True)
+ row.prop(brush, "use_relative_jitter", text="", icon='LOCKED')
+ row.prop(brush, "jitter", slider=True)
else:
- row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
- row.prop(brush, "jitter_absolute")
+ row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
+ row.prop(brush, "jitter_absolute")
row.prop(brush, "use_pressure_jitter", toggle=True, text="")
col.prop(brush, "vertex_tool", text="Blend")
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c 2013-03-11 01:59:48 UTC (rev 55183)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c 2013-03-11 02:19:58 UTC (rev 55184)
@@ -715,14 +715,12 @@
/* -------------------------------------------------------------------- */
/* Operator callbacks */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list