Merge pull request #252 from rchristie/field_compare_none

Avoid testing equality of Field and None
ABI-Software · Apr 22, 2024 · d02ebbd · d02ebbd
2 parents 6d9b67c + e421f74
commit d02ebbd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/scaffoldmaker/annotation/annotationgroup.py b/src/scaffoldmaker/annotation/annotationgroup.py
@@ -357,7 +357,10 @@ def setMarkerMaterialCoordinates(self, materialCoordinatesField, materialCoordin
         markerNode = nodes.findNodeByIdentifier(self._markerIdentifier)
         with ChangeManager(fieldmodule):
             oldMaterialCoordinatesField, oldMaterialCoordinates = self.getMarkerMaterialCoordinates()
-            if materialCoordinatesField != oldMaterialCoordinatesField:
+            # comparing Zinc Field with None fails on some Python implementations:
+            if ((materialCoordinatesField and not oldMaterialCoordinatesField) or
+                (oldMaterialCoordinatesField and not materialCoordinatesField) or
+                (materialCoordinatesField != oldMaterialCoordinatesField)):
                 nodetemplate = nodes.createNodetemplate()
                 if self._markerMaterialCoordinatesField:
                     assert RESULT_OK == nodetemplate.undefineField(self._markerMaterialCoordinatesField)