[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43860] trunk/blender: Code Cleanup: check is / is not when comparing singletons.

Campbell Barton ideasman42 at gmail.com
Thu Feb 2 22:07:57 CET 2012


Revision: 43860
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43860
Author:   campbellbarton
Date:     2012-02-02 21:07:56 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Code Cleanup: check is / is not when comparing singletons.

Modified Paths:
--------------
    trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
    trunk/blender/doc/blender_file_format/BlendFileReader.py
    trunk/blender/intern/cycles/app/io_export_cycles_xml.py
    trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
    trunk/blender/source/blender/python/rna_dump.py
    trunk/blender/source/tests/bl_mesh_modifiers.py

Modified: trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
===================================================================
--- trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py	2012-02-02 20:58:56 UTC (rev 43859)
+++ trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py	2012-02-02 21:07:56 UTC (rev 43860)
@@ -206,13 +206,13 @@
                 <td>${size}</td>
             </tr>"""
         
-        if field.Type.Structure == None or field.Name.IsPointer():
+        if field.Type.Structure is None or field.Name.IsPointer():
 
             # ${reference}
             reference = field.Name.AsReference(parentReference)
 
             # ${struct}
-            if parentReference != None:
+            if parentReference is not None:
                 struct = '<a href="#{0}">{0}</a>'.format(structure.Type.Name)
             else:
                 struct = structure.Type.Name
@@ -240,7 +240,7 @@
             
             structure_field = Template(structure_field_template).substitute(d)
         
-        elif field.Type.Structure != None:
+        elif field.Type.Structure is not None:
             reference = field.Name.AsReference(parentReference)
             structure_field = self.StructureFields(field.Type.Structure, reference, offset) 
 

Modified: trunk/blender/doc/blender_file_format/BlendFileReader.py
===================================================================
--- trunk/blender/doc/blender_file_format/BlendFileReader.py	2012-02-02 20:58:56 UTC (rev 43859)
+++ trunk/blender/doc/blender_file_format/BlendFileReader.py	2012-02-02 21:07:56 UTC (rev 43860)
@@ -329,7 +329,7 @@
         self.Name = name
         
     def AsReference(self, parent):
-        if parent == None:
+        if parent is None:
             result = ""
         else:
             result = parent+"."

Modified: trunk/blender/intern/cycles/app/io_export_cycles_xml.py
===================================================================
--- trunk/blender/intern/cycles/app/io_export_cycles_xml.py	2012-02-02 20:58:56 UTC (rev 43859)
+++ trunk/blender/intern/cycles/app/io_export_cycles_xml.py	2012-02-02 21:07:56 UTC (rev 43860)
@@ -93,7 +93,7 @@
 
     @classmethod
     def poll(cls, context):
-        return context.active_object != None
+        return (context.active_object is not None)
 
     def execute(self, context):
         filepath = bpy.path.ensure_ext(self.filepath, ".xml")

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py	2012-02-02 20:58:56 UTC (rev 43859)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py	2012-02-02 21:07:56 UTC (rev 43860)
@@ -166,7 +166,7 @@
         col.prop(curve, "bevel_object", text="")
 
         row = col.row()
-        row.active = curve.bevel_object != None
+        row.active = (curve.bevel_object is not None)
         row.prop(curve, "use_fill_caps")
 
 

Modified: trunk/blender/source/blender/python/rna_dump.py
===================================================================
--- trunk/blender/source/blender/python/rna_dump.py	2012-02-02 20:58:56 UTC (rev 43859)
+++ trunk/blender/source/blender/python/rna_dump.py	2012-02-02 21:07:56 UTC (rev 43860)
@@ -79,7 +79,7 @@
     except:
         keys = None
 
-    if keys != None:
+    if keys is not None:
         if PRINT_DATA:
             print(txt + '.keys() - ' + str(r.keys()))
 

Modified: trunk/blender/source/tests/bl_mesh_modifiers.py
===================================================================
--- trunk/blender/source/tests/bl_mesh_modifiers.py	2012-02-02 20:58:56 UTC (rev 43859)
+++ trunk/blender/source/tests/bl_mesh_modifiers.py	2012-02-02 21:07:56 UTC (rev 43860)
@@ -74,7 +74,7 @@
 
 def render_gl_all_modes(context, obj, filepath=""):
 
-    assert(obj != None)
+    assert(obj is not None)
     assert(filepath != "")
 
     scene = context.scene




More information about the Bf-blender-cvs mailing list