[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3391] contrib/py/scripts/addons: Code clean-up: Use standard-conformal {'sets'} for . report and operator return values
Sebastian Nell
codemanx at gmx.de
Thu May 24 00:11:55 CEST 2012
Revision: 3391
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3391
Author: codemanx
Date: 2012-05-23 22:11:53 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Code clean-up: Use standard-conformal {'sets'} for .report and operator return values
Modified Paths:
--------------
contrib/py/scripts/addons/btrace/bTrace.py
contrib/py/scripts/addons/cmu_mocap_browser/__init__.py
contrib/py/scripts/addons/curve_tools.py
contrib/py/scripts/addons/geodesic_domes/third_domes_panel.py
contrib/py/scripts/addons/gpencil_retopo/__init__.py
contrib/py/scripts/addons/io_export_dxf/operator.py
contrib/py/scripts/addons/io_export_marmalade.py
contrib/py/scripts/addons/io_scene_ms3d/ms3d_export.py
contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py
contrib/py/scripts/addons/mesh_show_vgroup_weights.py
contrib/py/scripts/addons/object_mangle_tools.py
contrib/py/scripts/addons/oscurart_tools.py
contrib/py/scripts/addons/particle_hair_lab.py
contrib/py/scripts/addons/presets/keyconfig/blender_2012_experimental.py
contrib/py/scripts/addons/sequencer_tools/export_strips.py
contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py
contrib/py/scripts/addons/text_editor_pasteall.py
Modified: contrib/py/scripts/addons/btrace/bTrace.py
===================================================================
--- contrib/py/scripts/addons/btrace/bTrace.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/btrace/bTrace.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -646,7 +646,7 @@
addtracemat(bpy.context.object.data)
if Btrace.animate:
bpy.ops.curve.btgrow()
- return{"FINISHED"}
+ return {'FINISHED'}
################## ################## ################## ############
@@ -734,7 +734,7 @@
bpy.ops.object.group_link(group="Btrace") # add to Btrace group
if Btrace.animate:
bpy.ops.curve.btgrow() # Add grow curve
- return{"FINISHED"}
+ return {'FINISHED'}
################## ################## ################## ############
@@ -811,7 +811,7 @@
if Btrace.animate:
bpy.ops.curve.btgrow() # Add grow curve
- return{"FINISHED"}
+ return {'FINISHED'}
###########################################################################
@@ -837,7 +837,7 @@
# Grids distribution not supported
if set.distribution == 'GRID':
- self.report('INFO',"Grid distribution mode for particles not supported.")
+ self.report({'INFO'},"Grid distribution mode for particles not supported.")
return{'FINISHED'}
Btrace = bpy.context.window_manager.curve_tracer
@@ -1040,11 +1040,11 @@
if Btrace.distort_curve:
scale = Btrace.distort_modscale
if scale == 0:
- return{"FINISHED"}
+ return {'FINISHED'}
for u in obj.data.splines:
for v in u.bezier_points:
v.radius = scale*round(random.random(),3)
- return{"FINISHED"}
+ return {'FINISHED'}
################## ################## ################## ############
@@ -1439,7 +1439,7 @@
n.strength = amplitude
n.scale = time_scale
n.phase = random.randint(0,999)
- return{"FINISHED"}
+ return {'FINISHED'}
################## ################## ################## ############
## Curve Grow Animation
Modified: contrib/py/scripts/addons/cmu_mocap_browser/__init__.py
===================================================================
--- contrib/py/scripts/addons/cmu_mocap_browser/__init__.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/cmu_mocap_browser/__init__.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -214,7 +214,7 @@
return {'RUNNING_MODAL'}
else:
self.import_or_open()
- return {"FINISHED"}
+ return {'FINISHED'}
def import_or_open(self):
cml = bpy.data.scenes[0].cmu_mocap_lib
Modified: contrib/py/scripts/addons/curve_tools.py
===================================================================
--- contrib/py/scripts/addons/curve_tools.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/curve_tools.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -781,7 +781,7 @@
objs = bpy.selection
if len(objs)!=3:
- self.report("ERROR","Please select 3 curves")
+ self.report({'ERROR'},"Please select 3 curves")
return {'FINISHED'}
scn = context.scene
Modified: contrib/py/scripts/addons/geodesic_domes/third_domes_panel.py
===================================================================
--- contrib/py/scripts/addons/geodesic_domes/third_domes_panel.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/geodesic_domes/third_domes_panel.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -760,7 +760,7 @@
if obj_name == "None":
message = "fill in a name \nof an existing mesh\nto be imported"
context.scene.error_message = message
- self.report({"INFO"}, message)
+ self.report({'INFO'}, message)
print("***INFO*** you have to fill in the name of an existing mesh")
else:
# obj_in_scene = context.objects
Modified: contrib/py/scripts/addons/gpencil_retopo/__init__.py
===================================================================
--- contrib/py/scripts/addons/gpencil_retopo/__init__.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/gpencil_retopo/__init__.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -57,7 +57,7 @@
from . import retopo
scene, gp = retopo.initialise(context)
if not gp:
- self.report('WARNING', "No grease pencil data found")
+ self.report({'WARNING'}, "No grease pencil data found")
return {'CANCELLED'}
obj_new = retopo.calculate(gp, self.precision)
Modified: contrib/py/scripts/addons/io_export_dxf/operator.py
===================================================================
--- contrib/py/scripts/addons/io_export_dxf/operator.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/io_export_dxf/operator.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -267,7 +267,7 @@
from .export_dxf import exportDXF
exportDXF(context, filePath, config)
- return {"FINISHED"}
+ return {'FINISHED'}
def _checkNO(self, val):
if val == 'NO': return None
@@ -278,6 +278,6 @@
self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".dxf")
WindowManager = context.window_manager
WindowManager.fileselect_add(self)
- return {"RUNNING_MODAL"}
+ return {'RUNNING_MODAL'}
Modified: contrib/py/scripts/addons/io_export_marmalade.py
===================================================================
--- contrib/py/scripts/addons/io_export_marmalade.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/io_export_marmalade.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -1449,14 +1449,14 @@
bpy.ops.object.mode_set(mode='OBJECT')
ExportMadeWithMarmaladeGroup(Config)
- return {"FINISHED"}
+ return {'FINISHED'}
def invoke(self, context, event):
if not self.filepath:
self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".group")
WindowManager = context.window_manager
WindowManager.fileselect_add(self)
- return {"RUNNING_MODAL"}
+ return {'RUNNING_MODAL'}
def menu_func(self, context):
Modified: contrib/py/scripts/addons/io_scene_ms3d/ms3d_export.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/ms3d_export.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/io_scene_ms3d/ms3d_export.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -151,7 +151,7 @@
#
def invoke(self, blenderContext, event):
blenderContext.window_manager.fileselect_add(self)
- return {"RUNNING_MODAL"}
+ return {'RUNNING_MODAL'}
# create a empty ms3d ms3dTemplate
# fill ms3dTemplate with blender content
@@ -202,7 +202,7 @@
print("elapsed time: {0:.4}s (converter: ~{1:.4}s, disk io:"
" ~{2:.4}s)".format((t3 - t1), (t2 - t1), (t3 - t2)))
- return {"FINISHED"}
+ return {'FINISHED'}
###########################################################################
Modified: contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -183,7 +183,7 @@
def invoke(self, blenderContext, event):
blenderContext.window_manager.fileselect_add(self)
- return {"RUNNING_MODAL"}
+ return {'RUNNING_MODAL'}
# create empty blender ms3dTemplate
# read ms3d file
@@ -250,7 +250,7 @@
print("elapsed time: {0:.4}s (disk io: ~{1:.4}s, converter:"
" ~{2:.4}s)".format((t3 - t1), (t2 - t1), (t3 - t2)))
- return {"FINISHED"}
+ return {'FINISHED'}
###########################################################################
Modified: contrib/py/scripts/addons/mesh_show_vgroup_weights.py
===================================================================
--- contrib/py/scripts/addons/mesh_show_vgroup_weights.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/mesh_show_vgroup_weights.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -184,7 +184,7 @@
clear_properties(full=False)
return {'RUNNING_MODAL'}
else:
- self.report({"WARNING"}, "View3D not found, can't run operator")
+ self.report({'WARNING'}, "View3D not found, can't run operator")
return {'CANCELLED'}
Modified: contrib/py/scripts/addons/object_mangle_tools.py
===================================================================
--- contrib/py/scripts/addons/object_mangle_tools.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/object_mangle_tools.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -77,7 +77,7 @@
random.seed( time.time() )
if mesh.shape_keys != None:
- self.report( {"INFO"}, "Cannot mangle mesh: Shape keys present" )
+ self.report({'INFO'}, "Cannot mangle mesh: Shape keys present")
return {'CANCELLED'}
for vert in verts:
@@ -133,7 +133,7 @@
ob = context.active_object
if ob.data.shape_keys != None:
- self.report({"INFO"}, "Cannot mangle curve. Shape keys present")
+ self.report({'INFO'}, "Cannot mangle curve. Shape keys present")
return {'CANCELLED'}
splines = context.object.data.splines
Modified: contrib/py/scripts/addons/oscurart_tools.py
===================================================================
--- contrib/py/scripts/addons/oscurart_tools.py 2012-05-23 20:52:55 UTC (rev 3390)
+++ contrib/py/scripts/addons/oscurart_tools.py 2012-05-23 22:11:53 UTC (rev 3391)
@@ -262,7 +262,7 @@
def execute(self,context):
for imgs in bpy.data.images:
imgs.reload()
- return{"FINISHED"}
+ return {'FINISHED'}
##-----------------------------RESYM---------------------------
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list