[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3686] trunk/py/scripts/addons: use sets when checking against multiple types
Campbell Barton
ideasman42 at gmail.com
Sat Aug 25 13:55:27 CEST 2012
Revision: 3686
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3686
Author: campbellbarton
Date: 2012-08-25 11:55:26 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
use sets when checking against multiple types
Modified Paths:
--------------
trunk/py/scripts/addons/io_anim_c3d/import_c3d.py
trunk/py/scripts/addons/io_export_dxf/primitive_exporters/mesh_exporter.py
trunk/py/scripts/addons/io_export_dxf/primitive_exporters/text_exporter.py
trunk/py/scripts/addons/io_import_gimp_image_to_scene.py
trunk/py/scripts/addons/netrender/client.py
trunk/py/scripts/addons/netrender/master.py
trunk/py/scripts/addons/netrender/ui.py
trunk/py/scripts/addons/space_view3d_copy_attributes.py
Modified: trunk/py/scripts/addons/io_anim_c3d/import_c3d.py
===================================================================
--- trunk/py/scripts/addons/io_anim_c3d/import_c3d.py 2012-08-23 14:19:46 UTC (rev 3685)
+++ trunk/py/scripts/addons/io_anim_c3d/import_c3d.py 2012-08-25 11:55:26 UTC (rev 3686)
@@ -183,7 +183,7 @@
(ig, ig, pointIdx,
self.procType) = struct.unpack('BBBB', infile.read(4))
self.procType -= 83
- if self.procType not in (1, 2):
+ if self.procType not in {1, 2}:
# 1(INTEL-PC); 2(DEC-VAX); 3(MIPS-SUN/SGI)
print('Warning: importer was not tested for files from '
'architectures other than Intel-PC and DEC-VAX')
Modified: trunk/py/scripts/addons/io_export_dxf/primitive_exporters/mesh_exporter.py
===================================================================
--- trunk/py/scripts/addons/io_export_dxf/primitive_exporters/mesh_exporter.py 2012-08-23 14:19:46 UTC (rev 3685)
+++ trunk/py/scripts/addons/io_export_dxf/primitive_exporters/mesh_exporter.py 2012-08-25 11:55:26 UTC (rev 3686)
@@ -112,7 +112,7 @@
args = copy.copy(kwargs)
args['points'] = points
entities.append(('Line', args))
- elif c in ('POLYFACE','POLYLINE'):
+ elif c in {'POLYFACE', 'POLYLINE'}:
if faces and allpoints:
#TODO: purge allpoints: left only vertices used by faces
# if exportsettings['verbose']:
Modified: trunk/py/scripts/addons/io_export_dxf/primitive_exporters/text_exporter.py
===================================================================
--- trunk/py/scripts/addons/io_export_dxf/primitive_exporters/text_exporter.py 2012-08-23 14:19:46 UTC (rev 3685)
+++ trunk/py/scripts/addons/io_export_dxf/primitive_exporters/text_exporter.py 2012-08-25 11:55:26 UTC (rev 3686)
@@ -36,7 +36,7 @@
#3=aligned, 4=middle, 5=fit
Alignment = None
alignment = text3d.getAlignment().value
- if alignment in (1,2): Alignment = alignment
+ if alignment in {1, 2}: Alignment = alignment
textHeight = text3d.getSize() / 1.7
textFlag = 0
Modified: trunk/py/scripts/addons/io_import_gimp_image_to_scene.py
===================================================================
--- trunk/py/scripts/addons/io_import_gimp_image_to_scene.py 2012-08-23 14:19:46 UTC (rev 3685)
+++ trunk/py/scripts/addons/io_import_gimp_image_to_scene.py 2012-08-25 11:55:26 UTC (rev 3686)
@@ -471,29 +471,29 @@
Mode = LayerList[Offset][1] # has to go one step further
LayerOpacity = LayerList[Offset][2]
- if not Mode in ('Normal', '-1'):
+ if not Mode in {'Normal', '-1'}:
Node = Tree.nodes.new('MIX_RGB')
if OpacityMode == 'COMPO': Node.inputs['Fac'].default_value[0] = LayerOpacity
else: Node.inputs['Fac'].default_value[0] = 1
Node.use_alpha = True
- if Mode in ('Addition', '7'): Node.blend_type = 'ADD'
- elif Mode in ('Subtract', '8'): Node.blend_type = 'SUBTRACT'
- elif Mode in ('Multiply', '3'): Node.blend_type = 'MULTIPLY'
- elif Mode in ('DarkenOnly', '9'): Node.blend_type = 'DARKEN'
- elif Mode in ('Dodge', '16'): Node.blend_type = 'DODGE'
- elif Mode in ('LightenOnly', '10'): Node.blend_type = 'LIGHTEN'
- elif Mode in ('Difference', '6'): Node.blend_type = 'DIFFERENCE'
- elif Mode in ('Divide', '15'): Node.blend_type = 'DIVIDE'
- elif Mode in ('Overlay', '5'): Node.blend_type = 'OVERLAY'
- elif Mode in ('Screen', '4'): Node.blend_type = 'SCREEN'
- elif Mode in ('Burn', '17'): Node.blend_type = 'BURN'
- elif Mode in ('Color', '13'): Node.blend_type = 'COLOR'
- elif Mode in ('Value', '14'): Node.blend_type = 'VALUE'
- elif Mode in ('Saturation', '12'): Node.blend_type = 'SATURATION'
- elif Mode in ('Hue', '11'): Node.blend_type = 'HUE'
- elif Mode in ('Softlight', '19'): Node.blend_type = 'SOFT_LIGHT'
+ if Mode in {'Addition', '7'}: Node.blend_type = 'ADD'
+ elif Mode in {'Subtract', '8'}: Node.blend_type = 'SUBTRACT'
+ elif Mode in {'Multiply', '3'}: Node.blend_type = 'MULTIPLY'
+ elif Mode in {'DarkenOnly', '9'}: Node.blend_type = 'DARKEN'
+ elif Mode in {'Dodge', '16'}: Node.blend_type = 'DODGE'
+ elif Mode in {'LightenOnly', '10'}: Node.blend_type = 'LIGHTEN'
+ elif Mode in {'Difference', '6'}: Node.blend_type = 'DIFFERENCE'
+ elif Mode in {'Divide', '15'}: Node.blend_type = 'DIVIDE'
+ elif Mode in {'Overlay', '5'}: Node.blend_type = 'OVERLAY'
+ elif Mode in {'Screen', '4'}: Node.blend_type = 'SCREEN'
+ elif Mode in {'Burn', '17'}: Node.blend_type = 'BURN'
+ elif Mode in {'Color', '13'}: Node.blend_type = 'COLOR'
+ elif Mode in {'Value', '14'}: Node.blend_type = 'VALUE'
+ elif Mode in {'Saturation', '12'}: Node.blend_type = 'SATURATION'
+ elif Mode in {'Hue', '11'}: Node.blend_type = 'HUE'
+ elif Mode in {'Softlight', '19'}: Node.blend_type = 'SOFT_LIGHT'
else: pass
else:
@@ -517,7 +517,7 @@
Nodes = bpy.context.scene.node_tree.nodes
if LayerLen > 1:
- for i in range (1, LayerLen+1):
+ for i in range (1, LayerLen + 1):
if i == 1:
Tree.links.new(Nodes['R_'+str(i)].outputs[0], Nodes['M_'+str(i)].inputs[1])
if 1 < i < LayerLen:
Modified: trunk/py/scripts/addons/netrender/client.py
===================================================================
--- trunk/py/scripts/addons/netrender/client.py 2012-08-23 14:19:46 UTC (rev 3685)
+++ trunk/py/scripts/addons/netrender/client.py 2012-08-25 11:55:26 UTC (rev 3686)
@@ -140,7 +140,7 @@
filename = filename[len(netsettings.vcs_wpath):]
- if filename[0] in (os.sep, os.altsep):
+ if filename[0] in {os.sep, os.altsep}:
filename = filename[1:]
job.addFile(filename, signed=False)
Modified: trunk/py/scripts/addons/netrender/master.py
===================================================================
--- trunk/py/scripts/addons/netrender/master.py 2012-08-23 14:19:46 UTC (rev 3685)
+++ trunk/py/scripts/addons/netrender/master.py 2012-08-25 11:55:26 UTC (rev 3686)
@@ -311,7 +311,7 @@
frame = job[frame_number]
if frame:
- if frame.status in (netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED):
+ if frame.status in {netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED}:
self.send_head(http.client.ACCEPTED)
elif frame.status == netrender.model.FRAME_DONE:
self.server.stats("", "Sending result to client")
@@ -379,7 +379,7 @@
frame = job[frame_number]
if frame:
- if frame.status in (netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED):
+ if frame.status in {netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED}:
self.send_head(http.client.ACCEPTED)
elif frame.status == netrender.model.FRAME_DONE:
filename = job.getResultPath(frame.getRenderFilename())
@@ -419,7 +419,7 @@
frame = job[frame_number]
if frame:
- if not frame.log_path or frame.status in (netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED):
+ if not frame.log_path or frame.status in {netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED}:
self.send_head(http.client.PROCESSING)
else:
self.server.stats("", "Sending log to client")
Modified: trunk/py/scripts/addons/netrender/ui.py
===================================================================
--- trunk/py/scripts/addons/netrender/ui.py 2012-08-23 14:19:46 UTC (rev 3685)
+++ trunk/py/scripts/addons/netrender/ui.py 2012-08-25 11:55:26 UTC (rev 3686)
@@ -116,7 +116,7 @@
layout.prop(netsettings, "mode", expand=True)
- if netsettings.mode in ("RENDER_MASTER", "RENDER_SLAVE"):
+ if netsettings.mode in {'RENDER_MASTER', 'RENDER_SLAVE'}:
layout.operator("render.netclientstart", icon='PLAY')
layout.prop(netsettings, "path")
Modified: trunk/py/scripts/addons/space_view3d_copy_attributes.py
===================================================================
--- trunk/py/scripts/addons/space_view3d_copy_attributes.py 2012-08-23 14:19:46 UTC (rev 3685)
+++ trunk/py/scripts/addons/space_view3d_copy_attributes.py 2012-08-25 11:55:26 UTC (rev 3686)
@@ -691,7 +691,7 @@
def execute(self, context):
mode = getattr(self, 'mode', '')
- if not mode in ('MAT', 'VCOL', 'IMAGE', 'UV'):
+ if not mode in {'MAT', 'VCOL', 'IMAGE', 'UV'}:
self.report({'ERROR'}, "No mode specified or invalid mode.")
return self._end(context, {'CANCELLED'})
layername = getattr(self, 'layer', '')
More information about the Bf-extensions-cvs
mailing list