[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25719] trunk/blender/release/scripts: dict.get() defaults to None as the second arg.

[Campbell Barton]

Revision: 25719
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25719
Author:   campbellbarton
Date:     2010-01-04 22:10:51 +0100 (Mon, 04 Jan 2010)

Log Message:
-----------
dict.get() defaults to None as the second arg. no need to supply it.

Modified Paths:
--------------
    trunk/blender/release/scripts/io/import_scene_obj.py
    trunk/blender/release/scripts/io/netrender/master.py
    trunk/blender/release/scripts/io/netrender/ui.py
    trunk/blender/release/scripts/modules/rigify_utils.py

Modified: trunk/blender/release/scripts/io/import_scene_obj.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_obj.py	2010-01-04 21:05:52 UTC (rev 25718)
+++ trunk/blender/release/scripts/io/import_scene_obj.py	2010-01-04 21:10:51 UTC (rev 25719)
@@ -886,12 +886,12 @@
     Add nurbs object to blender, only support one type at the moment
     '''
     deg = context_nurbs.get('deg', (3,))
-    curv_range = context_nurbs.get('curv_range', None)
+    curv_range = context_nurbs.get('curv_range')
     curv_idx = context_nurbs.get('curv_idx', [])
     parm_u = context_nurbs.get('parm_u', [])
     parm_v = context_nurbs.get('parm_v', [])
     name = context_nurbs.get('name', 'ObjNurb')
-    cstype = context_nurbs.get('cstype', None)
+    cstype = context_nurbs.get('cstype')
 
     if cstype == None:
         print('\tWarning, cstype not found')

Modified: trunk/blender/release/scripts/io/netrender/master.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/master.py	2010-01-04 21:05:52 UTC (rev 25718)
+++ trunk/blender/release/scripts/io/netrender/master.py	2010-01-04 21:10:51 UTC (rev 25719)
@@ -760,7 +760,7 @@
         self.slaves_map.pop(slave.id)
 
     def getSlave(self, slave_id):
-        return self.slaves_map.get(slave_id, None)
+        return self.slaves_map.get(slave_id)
 
     def getSeenSlave(self, slave_id):
         slave = self.getSlave(slave_id)
@@ -842,7 +842,7 @@
         job.save()
 
     def getJobID(self, id):
-        return self.jobs_map.get(id, None)
+        return self.jobs_map.get(id)
 
     def __iter__(self):
         for job in self.jobs:

Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py	2010-01-04 21:05:52 UTC (rev 25718)
+++ trunk/blender/release/scripts/io/netrender/ui.py	2010-01-04 21:10:51 UTC (rev 25719)
@@ -303,7 +303,7 @@
                 description="broadcast server address on local network",
                 default = True)
 
-default_path = os.environ.get("TEMP", None)
+default_path = os.environ.get("TEMP")
 
 if not default_path:
     if os.name == 'nt':

Modified: trunk/blender/release/scripts/modules/rigify_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify_utils.py	2010-01-04 21:05:52 UTC (rev 25718)
+++ trunk/blender/release/scripts/modules/rigify_utils.py	2010-01-04 21:10:51 UTC (rev 25719)
@@ -129,7 +129,7 @@
         target_bone = apply_bones[-1] # default to the last bone
 
     prop_pbone = obj.pose.bones[target_bone]
-    if prop_pbone.get(target_bone, None) is None:
+    if prop_pbone.get(target_bone) is None:
         prop = rna_idprop_ui_prop_get(prop_pbone, target_prop, create=True)
         prop_pbone[target_prop] = blend_default
         prop["soft_min"] = 0.0
@@ -402,9 +402,9 @@
     for member in self.attr_names:
         name = getattr(self, member, None)
         if name is not None:
-            setattr(self, member + "_b", bbones.get(name, None))
-            setattr(self, member + "_p", pbones.get(name, None))
-            setattr(self, member + "_e", ebones.get(name, None))
+            setattr(self, member + "_b", bbones.get(name))
+            setattr(self, member + "_p", pbones.get(name))
+            setattr(self, member + "_e", ebones.get(name))
 
 
 def _bone_class_instance_rename(self, attr, new_name):