Ensure we iterate over the longest in bitwise on bigbitdata.

Replaces #2810
coleifer · Dec 1, 2023 · 110faf3 · 110faf3
1 parent 6286684
commit 110faf3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/peewee.py b/peewee.py
@@ -5118,7 +5118,8 @@ def _bitwise_op(self, other, op):
         else:
             raise ValueError('Incompatible data-type')
         buf = bytearray(b'\x00' * max(len(self), len(other)))
-        for i, (a, b) in enumerate(zip(self._buffer, data)):
+        it = itertools.zip_longest(self._buffer, data, fillvalue=0)
+        for i, (a, b) in enumerate(it):
             buf[i] = op(a, b)
         return buf
 

diff --git a/tests/fields.py b/tests/fields.py
@@ -741,6 +741,16 @@ def test_bigbit_field_bitwise(self):
         b1.data ^= b3.data
         self.assertEqual(b1.data._buffer, b'\x8b')
 
+        b1.data = b'\x11'
+        self.assertEqual(b1.data & b'\xff\xff', b'\x11\x00')
+        self.assertEqual(b1.data | b'\xff\xff', b'\xff\xff')
+        self.assertEqual(b1.data ^ b'\xff\xff', b'\xee\xff')
+
+        b1.data = b'\x11\x11'
+        self.assertEqual(b1.data & b'\xff', b'\x11\x00')
+        self.assertEqual(b1.data | b'\xff', b'\xff\x11')
+        self.assertEqual(b1.data ^ b'\xff', b'\xee\x11')
+
     def test_bigbit_field_bulk_create(self):
         b1, b2, b3 = Bits(), Bits(), Bits()
         b1.data.set_bit(1)