[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31998] trunk/blender/release: use is rather then == when comparing against None.
Campbell Barton
ideasman42 at gmail.com
Sat Sep 18 12:43:32 CEST 2010
Revision: 31998
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31998
Author: campbellbarton
Date: 2010-09-18 12:43:32 +0200 (Sat, 18 Sep 2010)
Log Message:
-----------
use is rather then == when comparing against None.
Modified Paths:
--------------
trunk/blender/release/getversion.py
trunk/blender/release/scripts/io/netrender/master.py
trunk/blender/release/scripts/io/netrender/slave.py
trunk/blender/release/scripts/io/netrender/utils.py
trunk/blender/release/scripts/modules/rigify/eye_balls.py
trunk/blender/release/scripts/modules/rigify/mouth.py
trunk/blender/release/scripts/modules/rigify/shape_key_control.py
trunk/blender/release/scripts/modules/rigify/shape_key_distance.py
trunk/blender/release/scripts/modules/rigify/shape_key_rotdiff.py
trunk/blender/release/scripts/modules/rigify/tail_control.py
trunk/blender/release/scripts/modules/rna_info.py
trunk/blender/release/scripts/modules/rna_prop_ui.py
trunk/blender/release/scripts/op/fcurve_euler_filter.py
trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py
trunk/blender/release/scripts/op/io_mesh_ply/export_ply.py
trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py
trunk/blender/release/scripts/op/io_scene_fbx/export_fbx.py
trunk/blender/release/scripts/op/io_scene_obj/export_obj.py
trunk/blender/release/scripts/op/io_scene_obj/import_obj.py
trunk/blender/release/scripts/op/io_scene_x3d/export_x3d.py
trunk/blender/release/scripts/op/sequencer.py
trunk/blender/release/scripts/ui/properties_texture.py
Modified: trunk/blender/release/getversion.py
===================================================================
--- trunk/blender/release/getversion.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/getversion.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -33,7 +33,7 @@
nanblenderhome = os.getenv("NANBLENDERHOME")
-if nanblenderhome == None:
+if nanblenderhome is None:
nanblenderhome = os.path.dirname(os.path.abspath(sys.argv[0])) + "/.."
config = nanblenderhome + "/source/blender/blenkernel/BKE_blender.h"
Modified: trunk/blender/release/scripts/io/netrender/master.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/master.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/io/netrender/master.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -124,7 +124,7 @@
if self.status not in {JOB_PAUSED, JOB_QUEUED}:
return
- if status == None:
+ if status is None:
self.status = JOB_PAUSED if self.status == JOB_QUEUED else JOB_QUEUED
elif status:
self.status = JOB_QUEUED
Modified: trunk/blender/release/scripts/io/netrender/slave.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/slave.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/io/netrender/slave.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -188,7 +188,7 @@
cancelled = False
stdout = bytes()
run_t = time.time()
- while not cancelled and process.poll() == None:
+ while not cancelled and process.poll() is None:
stdout += process.stdout.read(1024)
current_t = time.time()
cancelled = engine.test_break()
@@ -219,7 +219,7 @@
if cancelled:
# kill process if needed
- if process.poll() == None:
+ if process.poll() is None:
try:
process.terminate()
except OSError:
Modified: trunk/blender/release/scripts/io/netrender/utils.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/utils.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/io/netrender/utils.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -192,7 +192,7 @@
def getFileInfo(filepath, infos):
process = subprocess.Popen([sys.argv[0], "-b", "-noaudio", filepath, "-P", __file__, "--"] + infos, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdout = bytes()
- while process.poll() == None:
+ while process.poll() is None:
stdout += process.stdout.read(1024)
# read leftovers if needed
Modified: trunk/blender/release/scripts/modules/rigify/eye_balls.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/eye_balls.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/modules/rigify/eye_balls.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -56,7 +56,7 @@
for driver_s in obj.data.shape_keys.animation_data.drivers:
if driver_s.data_path == driver_path:
fcurve = driver_s
- if fcurve == None:
+ if fcurve is None:
fcurve = obj.data.shape_keys.keys[name].driver_add("value")
fcurve.driver.type = 'AVERAGE'
new = True
Modified: trunk/blender/release/scripts/modules/rigify/mouth.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/mouth.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/modules/rigify/mouth.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -76,7 +76,7 @@
for driver_s in obj.data.shape_keys.animation_data.drivers:
if driver_s.data_path == driver_path:
fcurve = driver_s
- if fcurve == None:
+ if fcurve is None:
fcurve = obj.data.shape_keys.keys[name].driver_add("value")
fcurve.driver.type = 'AVERAGE'
new = True
Modified: trunk/blender/release/scripts/modules/rigify/shape_key_control.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/shape_key_control.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/modules/rigify/shape_key_control.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -56,7 +56,7 @@
for driver_s in obj.data.shape_keys.animation_data.drivers:
if driver_s.data_path == driver_path:
fcurve = driver_s
- if fcurve == None:
+ if fcurve is None:
fcurve = obj.data.shape_keys.keys[name].driver_add("value")
fcurve.driver.type = 'AVERAGE'
new = True
Modified: trunk/blender/release/scripts/modules/rigify/shape_key_distance.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/shape_key_distance.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/modules/rigify/shape_key_distance.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -53,7 +53,7 @@
for driver_s in obj.data.shape_keys.animation_data.drivers:
if driver_s.data_path == driver_path:
fcurve = driver_s
- if fcurve == None:
+ if fcurve is None:
fcurve = obj.data.shape_keys.keys[name].driver_add("value")
fcurve.driver.type = 'AVERAGE'
Modified: trunk/blender/release/scripts/modules/rigify/shape_key_rotdiff.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/shape_key_rotdiff.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/modules/rigify/shape_key_rotdiff.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -53,7 +53,7 @@
for driver_s in obj.data.shape_keys.animation_data.drivers:
if driver_s.data_path == driver_path:
fcurve = driver_s
- if fcurve == None:
+ if fcurve is None:
fcurve = obj.data.shape_keys.keys[name].driver_add("value")
fcurve.driver.type = 'AVERAGE'
Modified: trunk/blender/release/scripts/modules/rigify/tail_control.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/tail_control.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/modules/rigify/tail_control.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -58,7 +58,7 @@
arm = obj.data
tail_base = arm.bones[orig_bone_name]
- if tail_base.parent == None:
+ if tail_base.parent is None:
raise RigifyError("'tail_control' rig type on bone '%s' requires a parent." % orig_bone_name)
bone_definitions = [tail_base.name]
Modified: trunk/blender/release/scripts/modules/rna_info.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_info.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/modules/rna_info.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -381,7 +381,7 @@
def _GetInfoRNA(bl_rna, cls, parent_id=''):
- if bl_rna == None:
+ if bl_rna is None:
return None
key = parent_id, bl_rna.identifier
Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -36,7 +36,7 @@
rna_ui = rna_idprop_ui_get(item, create)
- if rna_ui == None:
+ if rna_ui is None:
return None
try:
@@ -49,7 +49,7 @@
def rna_idprop_ui_prop_clear(item, prop):
rna_ui = rna_idprop_ui_get(item, False)
- if rna_ui == None:
+ if rna_ui is None:
return
try:
Modified: trunk/blender/release/scripts/op/fcurve_euler_filter.py
===================================================================
--- trunk/blender/release/scripts/op/fcurve_euler_filter.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/op/fcurve_euler_filter.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -15,7 +15,7 @@
prev = keys[i-1] if i > 0 else None
next = keys[i+1] if i < len(keys)-1 else None
- if prev == None:
+ if prev is None:
continue
th = pi
Modified: trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py
===================================================================
--- trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -177,7 +177,7 @@
# Apply the parents offset accumletivly
- if my_parent == None:
+ if my_parent is None:
rest_head_world = Vector(rest_head_local)
else:
rest_head_world = my_parent.rest_head_world + rest_head_local
Modified: trunk/blender/release/scripts/op/io_mesh_ply/export_ply.py
===================================================================
--- trunk/blender/release/scripts/op/io_mesh_ply/export_ply.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/op/io_mesh_ply/export_ply.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -142,7 +142,7 @@
vdict_local = vdict[vidx]
pf_vidx = vdict_local.get(key) # Will be None initially
- if pf_vidx == None: # same as vdict_local.has_key(key)
+ if pf_vidx is None: # same as vdict_local.has_key(key)
pf_vidx = vdict_local[key] = vert_count
ply_verts.append((vidx, normal, uvcoord, color))
vert_count += 1
Modified: trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py 2010-09-18 10:37:51 UTC (rev 31997)
+++ trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py 2010-09-18 10:43:32 UTC (rev 31998)
@@ -303,17 +303,17 @@
self.value=val
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list