Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid testing equality of Field and None #252

Merged
merged 1 commit into from
Apr 22, 2024
Merged

Avoid testing equality of Field and None #252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/scaffoldmaker/annotation/annotationgroup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down