== and != being misused a lot when comparing Arrays. Concealing some bugs.

Scott Griffiths · Scott Griffiths · commit 3cb77e99eb56 · 2024-02-27T17:37:21.000Z
diff --git a/bitstring/array_.py b/bitstring/array_.py
@@ -722,15 +722,17 @@ def __le__(self, other: Union[int, float, Array]) -> Array:
             return self._apply_op_between_arrays(operator.le, other, is_comparison=True)
         return self._apply_op_to_all_elements(operator.le, other, is_comparison=True)
 
-    def __eq__(self, other: Union[int, float, str, BitsType, Array]) -> Array:
-        if isinstance(other, Array):
-            return self._apply_op_between_arrays(operator.eq, other, is_comparison=True)
-        return self._apply_op_to_all_elements(operator.eq, other, is_comparison=True)
-
-    def __ne__(self, other: Union[int, float, str, BitsType, Array]) -> Array:
-        if isinstance(other, Array):
-            return self._apply_op_between_arrays(operator.ne, other, is_comparison=True)
-        return self._apply_op_to_all_elements(operator.ne, other, is_comparison=True)
+    def __eq__(self, other: Union[int, float, str, Array]) -> Array:
+        if isinstance(other, (int, float, str, Bits)):
+            return self._apply_op_to_all_elements(operator.eq, other, is_comparison=True)
+        other = Array(self.dtype, other)
+        return self._apply_op_between_arrays(operator.eq, other, is_comparison=True)
+
+    def __ne__(self, other: Union[int, float, str, Array]) -> Array:
+        if isinstance(other, (int, float, str, Bits)):
+            return self._apply_op_to_all_elements(operator.ne, other, is_comparison=True)
+        other = Array(self.dtype, other)
+        return self._apply_op_between_arrays(operator.ne, other, is_comparison=True)
 
     # Unary operators
 
diff --git a/tests/test_array.py b/tests/test_array.py
@@ -163,7 +163,7 @@ def test_format_changes(self):
         b = a[:]
         b.dtype = 'int8'
         assert a.tolist() == b.tolist()
-        assert a != b
+        assert not a.equals(b)
         with pytest.raises(ValueError):
             b.dtype = 'hello_everyone'
         with pytest.raises(ValueError):
@@ -277,18 +277,18 @@ def test_equivalence(self):
         assert a.data == b.data
 
         b = array.array('f', [54.2, -998, 411.9])
-        assert a == b
+        assert a.equals(b)
         a.dtype = 'bool'
-        assert a != b
+        assert not a.equals(b)
         a.dtype = 'floatne16'
-        assert a != b
+        assert not a.equals(b)
         a.dtype = 'floatne32'
         a.data += '0x0'
-        assert a != b
+        assert not a.equals(b)
         a.data += '0x0000000'
-        assert a != b
+        assert not a.equals(b)
         b.append(0.0)
-        assert a == b
+        assert a.equals(b)
 
     def test_extend(self):
         a = Array('uint:3', (1, 2, 3))
@@ -320,7 +320,7 @@ def test_extend_with_mixed_classes(self):
 
         a.dtype = 'int8'
         ap = Array('uint8', a.tolist())
-        assert a != ap
+        assert not a.equals(ap)
         assert a.tolist() == ap.tolist()
 
     def test_insert(self):
@@ -814,9 +814,17 @@ def test_less_than_with_array(self):
     def test_array_equals(self):
         a = Array('i12', [1, 2, -3, 4, -5, 6])
         b = Array('i12', [6, 5, 4, 3, 2, 1])
-        assert abs(a) == b[::-1]
-        assert a != b
-
+        assert abs(a).equals(b[::-1])
+        assert (a == b) == [False, False, False, False, False, False]
+        assert (a != b) == [True, True, True, True, True, True]
+        with pytest.raises(ValueError):
+            _ = a == b[:-1]
+        with pytest.raises(ValueError):
+            _ = a == [1, 2, 3]
+        with pytest.raises(ValueError):
+            _ = [1, 2, 3] == a
+        with pytest.raises(ValueError):
+            _ = a == [1, 2, 3, 4, 5, 6, 7]
 
 class TestAsType:
 
