[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3687] contrib/py/scripts/addons: use sets when checking against multiple types

[Campbell Barton]

Revision: 3687
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3687
Author:   campbellbarton
Date:     2012-08-25 11:55:57 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
use sets when checking against multiple types

Modified Paths:
--------------
    contrib/py/scripts/addons/io_scene_cod/__init__.py
    contrib/py/scripts/addons/io_scene_cod/export_xanim.py
    contrib/py/scripts/addons/io_sequencer_edl/import_edl.py
    contrib/py/scripts/addons/object_mangle_tools.py
    contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py

Modified: contrib/py/scripts/addons/io_scene_cod/__init__.py
===================================================================
--- contrib/py/scripts/addons/io_scene_cod/__init__.py	2012-08-25 11:55:26 UTC (rev 3686)
+++ contrib/py/scripts/addons/io_scene_cod/__init__.py	2012-08-25 11:55:57 UTC (rev 3687)
@@ -248,7 +248,7 @@
         row.prop(self, "use_version", expand=True)
 
         # Calculate number of selected mesh objects
-        if context.mode in ('OBJECT', 'PAINT_WEIGHT'):
+        if context.mode in {'OBJECT', 'PAINT_WEIGHT'}:
             meshes_selected = len([m for m in bpy.data.objects if m.type == 'MESH' and m.select])
         else:
             meshes_selected = 0

Modified: contrib/py/scripts/addons/io_scene_cod/export_xanim.py
===================================================================
--- contrib/py/scripts/addons/io_scene_cod/export_xanim.py	2012-08-25 11:55:26 UTC (rev 3686)
+++ contrib/py/scripts/addons/io_scene_cod/export_xanim.py	2012-08-25 11:55:57 UTC (rev 3687)
@@ -206,7 +206,7 @@
     # Close to flush buffers!
     file.close()
 
-    if use_notetrack and use_notetrack_format in ('5', '7'):
+    if use_notetrack and use_notetrack_format in {'5', '7'}:
 
         import os.path
         filepath = os.path.splitext(filepath)[0] + ".NT_EXPORT"

Modified: contrib/py/scripts/addons/io_sequencer_edl/import_edl.py
===================================================================
--- contrib/py/scripts/addons/io_sequencer_edl/import_edl.py	2012-08-25 11:55:26 UTC (rev 3686)
+++ contrib/py/scripts/addons/io_sequencer_edl/import_edl.py	2012-08-25 11:55:57 UTC (rev 3687)
@@ -600,7 +600,7 @@
     icu.append((0, 0))
     icu.append(((int(blendin) / len_disp) * 100, 1))
 
-    if mov.type not in (SEQ_HD_SOUND, SEQ_RAM_SOUND):
+    if mov.type not in {SEQ_HD_SOUND, SEQ_RAM_SOUND}:
         mov.blendMode = Blender.Scene.Sequence.BlendModes.ALPHAOVER
 
 

Modified: contrib/py/scripts/addons/object_mangle_tools.py
===================================================================
--- contrib/py/scripts/addons/object_mangle_tools.py	2012-08-25 11:55:26 UTC (rev 3686)
+++ contrib/py/scripts/addons/object_mangle_tools.py	2012-08-25 11:55:57 UTC (rev 3687)
@@ -141,7 +141,7 @@
         for spline in splines:
             if spline.type == 'BEZIER':
                 points = spline.bezier_points
-            elif spline.type in ('POLY', 'NURBS'):
+            elif spline.type in {'POLY', 'NURBS'}:
                 points = spline.points
 
             for point in points:

Modified: contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py
===================================================================
--- contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py	2012-08-25 11:55:26 UTC (rev 3686)
+++ contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py	2012-08-25 11:55:57 UTC (rev 3687)
@@ -3054,9 +3054,9 @@
             if reuse and ((variant == 'RAW') or (len(obj.modifiers) == 0)):
                 return (obj, False)
             else:
-                force_objectmode = (obj_mode in ('EDIT', 'SCULPT'))
+                force_objectmode = (obj_mode in {'EDIT', 'SCULPT'})
                 return (self._to_mesh(obj, variant, force_objectmode), True)
-        elif obj_type in ('CURVE', 'SURFACE', 'FONT'):
+        elif obj_type in {'CURVE', 'SURFACE', 'FONT'}:
             if variant == 'RAW':
                 bm = bmesh.new()
                 for spline in data.splines: