diff options
| -rwxr-xr-x | doc/blender_file_format/BlendFileDnaExporter_25.py | 6 | ||||
| -rw-r--r-- | doc/blender_file_format/BlendFileReader.py | 2 | ||||
| -rw-r--r-- | intern/cycles/app/io_export_cycles_xml.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_curve.py | 2 | ||||
| -rw-r--r-- | source/blender/python/rna_dump.py | 2 | ||||
| -rw-r--r-- | source/tests/bl_mesh_modifiers.py | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/doc/blender_file_format/BlendFileDnaExporter_25.py b/doc/blender_file_format/BlendFileDnaExporter_25.py index bc5b2e73c7e..a201f618fbb 100755 --- a/doc/blender_file_format/BlendFileDnaExporter_25.py +++ b/doc/blender_file_format/BlendFileDnaExporter_25.py @@ -206,13 +206,13 @@ class DNACatalogHTML: <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 @@ class DNACatalogHTML: 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) diff --git a/doc/blender_file_format/BlendFileReader.py b/doc/blender_file_format/BlendFileReader.py index 313c8c7ff5d..88eb71b3ce2 100644 --- a/doc/blender_file_format/BlendFileReader.py +++ b/doc/blender_file_format/BlendFileReader.py @@ -329,7 +329,7 @@ class DNAName: self.Name = name def AsReference(self, parent): - if parent == None: + if parent is None: result = "" else: result = parent+"." diff --git a/intern/cycles/app/io_export_cycles_xml.py b/intern/cycles/app/io_export_cycles_xml.py index 2314d935214..3ba9e201d11 100644 --- a/intern/cycles/app/io_export_cycles_xml.py +++ b/intern/cycles/app/io_export_cycles_xml.py @@ -93,7 +93,7 @@ class ExportCyclesXML(bpy.types.Operator, ExportHelper): @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") diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index f8e3d48d40c..3aa995353b2 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -166,7 +166,7 @@ class DATA_PT_geometry_curve(CurveButtonsPanel, Panel): 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") diff --git a/source/blender/python/rna_dump.py b/source/blender/python/rna_dump.py index df902886f30..489f011e693 100644 --- a/source/blender/python/rna_dump.py +++ b/source/blender/python/rna_dump.py @@ -79,7 +79,7 @@ def seek(r, txt, recurs): except: keys = None - if keys != None: + if keys is not None: if PRINT_DATA: print(txt + '.keys() - ' + str(r.keys())) diff --git a/source/tests/bl_mesh_modifiers.py b/source/tests/bl_mesh_modifiers.py index 917ccbc0d24..0495f5d9f98 100644 --- a/source/tests/bl_mesh_modifiers.py +++ b/source/tests/bl_mesh_modifiers.py @@ -74,7 +74,7 @@ def render_gl(context, filepath, shade): def render_gl_all_modes(context, obj, filepath=""): - assert(obj != None) + assert(obj is not None) assert(filepath != "") scene = context.scene |