[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30355] trunk/blender/release/scripts: use dict comprehension where possible

[Campbell Barton]

Revision: 30355
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30355
Author:   campbellbarton
Date:     2010-07-15 02:52:26 +0200 (Thu, 15 Jul 2010)

Log Message:
-----------
use dict comprehension where possible

Modified Paths:
--------------
    trunk/blender/release/scripts/io/import_scene_3ds.py
    trunk/blender/release/scripts/io/import_scene_obj.py
    trunk/blender/release/scripts/modules/bpy_types.py
    trunk/blender/release/scripts/op/uvcalc_follow_active.py

Modified: trunk/blender/release/scripts/io/import_scene_3ds.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_3ds.py	2010-07-14 23:51:21 UTC (rev 30354)
+++ trunk/blender/release/scripts/io/import_scene_3ds.py	2010-07-15 00:52:26 UTC (rev 30355)
@@ -360,7 +360,7 @@
             vertMappingIndex = 0
 
             vertsToUse = [i for i in range(len(myContextMesh_vertls)) if faceVertUsers[i]]
-            myVertMapping = dict( [ (ii, i) for i, ii in enumerate(vertsToUse) ] )
+            myVertMapping = {ii: i for i, ii in enumerate(vertsToUse)}
 
             tempName= '%s_%s' % (contextObName, matName) # matName may be None.
             bmesh = bpy.data.meshes.new(tempName)

Modified: trunk/blender/release/scripts/io/import_scene_obj.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_obj.py	2010-07-14 23:51:21 UTC (rev 30354)
+++ trunk/blender/release/scripts/io/import_scene_obj.py	2010-07-15 00:52:26 UTC (rev 30355)
@@ -596,7 +596,7 @@
 
     if unique_smooth_groups:
         sharp_edges= {}
-        smooth_group_users= dict([ (context_smooth_group, {}) for context_smooth_group in list(unique_smooth_groups.keys()) ])
+        smooth_group_users = {context_smooth_group: {} for context_smooth_group in list(unique_smooth_groups.keys())}
         context_smooth_group_old= -1
 
     # Split fgons into tri's
@@ -691,7 +691,7 @@
 
 
     # map the material names to an index
-    material_mapping= dict([(name, i) for i, name in enumerate(unique_materials)]) # enumerate over unique_materials keys()
+    material_mapping = {name: i for i, name in enumerate(unique_materials)} # enumerate over unique_materials keys()
 
     materials= [None] * len(unique_materials)
 

Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py	2010-07-14 23:51:21 UTC (rev 30354)
+++ trunk/blender/release/scripts/modules/bpy_types.py	2010-07-15 00:52:26 UTC (rev 30355)
@@ -444,7 +444,7 @@
         if not hasattr(edges, "pop"):
             edges = edges[:]
 
-        edge_dict = dict((ed.key, ed) for ed in self.edges if ed.selected)
+        edge_dict = {ed.key: ed for ed in self.edges if ed.selected}
 
         while edges:
             current_edge = edges.pop()

Modified: trunk/blender/release/scripts/op/uvcalc_follow_active.py
===================================================================
--- trunk/blender/release/scripts/op/uvcalc_follow_active.py	2010-07-14 23:51:21 UTC (rev 30354)
+++ trunk/blender/release/scripts/op/uvcalc_follow_active.py	2010-07-15 00:52:26 UTC (rev 30355)
@@ -65,9 +65,9 @@
 
         # vertex index is the key, uv is the value
 
-        uvs_vhash_source = dict([(vindex, uvs_source[i]) for i, vindex in enumerate(vidx_source)])
+        uvs_vhash_source = {vindex: uvs_source[i] for i, vindex in enumerate(vidx_source)}
 
-        uvs_vhash_target = dict([(vindex, uvs_target[i]) for i, vindex in enumerate(vidx_target)])
+        uvs_vhash_target = {vindex: uvs_target[i] for i, vindex in enumerate(vidx_target)}
 
         edge_idxs_source = face_edge_vs(vidx_source)
         edge_idxs_target = face_edge_vs(vidx_target)