Review changes.

pp-mo · pp-mo · commit 9efe4f62ea11 · 2023-07-20T14:44:55.000+01:00
diff --git a/lib/iris/cube.py b/lib/iris/cube.py
@@ -955,17 +955,17 @@ def __setstate__(self, state):
         self.locals, self.globals = state
 
     #
-    # Support simple comparison, even when contents are arrays.
+    # Support comparison -- required because default operation only compares a single
+    # value at each key.
     #
     def __eq__(self, other):
-        # For equality, require both globals + locals to match
+        # For equality, require both globals + locals to match exactly.
+        # NOTE: array content works correctly, since 'locals' and 'globals' are always
+        # iris.common.mixin.LimitedAttributeDict, which gets this right.
         other = CubeAttrsDict(other)
         result = self.locals == other.locals and self.globals == other.globals
         return result
 
-    def __ne__(self, other):
-        return not self == other
-
     #
     # Provide a copy method, as for 'dict', but *not* provided by MutableMapping
     #

Original file line number	Diff line number	Diff line change
`@@ -955,17 +955,17 @@ def __setstate__(self, state):`
`955`	`955`	`self.locals, self.globals = state`
`956`	`956`
`957`	`957`	`#`
`958`		`- # Support simple comparison, even when contents are arrays.`
	`958`	`+ # Support comparison -- required because default operation only compares a single`
	`959`	`+ # value at each key.`
`959`	`960`	`#`
`960`	`961`	`def __eq__(self, other):`
`961`		`- # For equality, require both globals + locals to match`
	`962`	`+ # For equality, require both globals + locals to match exactly.`
	`963`	`+ # NOTE: array content works correctly, since 'locals' and 'globals' are always`
	`964`	`+ # iris.common.mixin.LimitedAttributeDict, which gets this right.`
`962`	`965`	`other = CubeAttrsDict(other)`
`963`	`966`	`result = self.locals == other.locals and self.globals == other.globals`
`964`	`967`	`return result`
`965`	`968`
`966`		`- def __ne__(self, other):`
`967`		`- return not self == other`
`968`		`-`
`969`	`969`	`#`
`970`	`970`	`# Provide a copy method, as for 'dict', but not provided by MutableMapping`
`971`	`971`	`#`