Added support for bytes in sliced __setitem__

Author: Léo Flaventin Hauchecorne

AUTHORS.rst

@@ -22,3 +22,4 @@ Contributors:
 * "durexyl" @ GitHub
 * "erki1993" @ GitHub
 * "mentaal" @ GitHub
+* Léo Flaventin Hauchecorne

NEWS.rst

@@ -2,6 +2,11 @@
 IntelHex releases
 *****************
 
+2.3 (2020-09-09)
+------------------
+* API changes: ``IntelHex.__setitem__`` method: added support for slices
+  with any iterable values. (Léo Flaventin Hauchecorne)
+
 2.2.1 (2018-01-30)
 ------------------
 * Fixes for PyPI.

Readme.rst

@@ -24,7 +24,7 @@ restrictions.
 
 Supported Python versions
 -------------------------
-IntelHex library v.2.2 supports Python 2 (2.4-2.7) and Python 3 (3.2-3.5 or later)
+IntelHex library v.2.3 supports Python 2 (2.4-2.7) and Python 3 (3.2-3.5 or later)
 without external libraries or 2to3 tool from the same codebase.
 
 Install

intelhex/__init__.py

@@ -480,8 +480,22 @@ def __setitem__(self, addr, byte):
                 raise TypeError('Address should be >= 0.')
             self._buf[addr] = byte
         elif t == slice:
-            if not isinstance(byte, (list, tuple)):
-                raise ValueError('Slice operation expects sequence of bytes')
+            slice_error = ValueError('Slice operation expects either a bytes, a sequence of byte values (0 <= byte <= 255), or anything convertible to bytes') # avoid duplication code
+            if not isinstance(byte, (bytes, bytearray)):
+                if isinstance(byte, (list, tuple)):
+                    try:
+                        check = all(0 <= x < 255 for x in byte)
+                    except TypeError as exc:
+                        raise slice_error from exc
+                    if not check :
+                        raise slice_error
+                    if not all(isinstance(x, int) for x in byte) :
+                        raise slice_error
+                else :
+                    try:
+                        byte = bytes(byte) # check for int + 0<=x<=255 + convert to something getitem works with
+                    except TypeError as exc:
+                        raise slice_error from exc
             start = addr.start
             stop = addr.stop
             step = addr.step or 1

intelhex/__version__.py

@@ -1,3 +1,3 @@
 # IntelHex library version information 
-version_info = (2, 2, 1)
+version_info = (2, 3)
 version_str = '.'.join([str(i) for i in version_info])

intelhex/test.py

@@ -679,6 +679,8 @@ def setitem(a,b):
         # slice operations
         ih[0:4] = range_l(4)
         self.assertEqual({0:0, 1:1, 2:2, 3:3}, ih.todict())
+        ih[0:4] = range_g(1,5)
+        self.assertEqual({0:1, 1:2, 2:3, 3:4}, ih.todict())
         ih[0:] = range_l(5,9)
         self.assertEqual({0:5, 1:6, 2:7, 3:8}, ih.todict())
         ih[:4] = range_l(9,13)
@@ -687,11 +689,25 @@ def setitem(a,b):
         ih = IntelHex()
         ih[0:8:2] = range_l(4)
         self.assertEqual({0:0, 2:1, 4:2, 6:3}, ih.todict())
+        ih[0:8:2] = b'\xDE\xAD\xBE\xEF'
+        self.assertEqual({0:0xDE, 2:0xAD, 4:0xBE, 6:0xEF}, ih.todict())
         # errors in slice operations
         # ih[1:2] = 'a'
         self.assertRaisesMsg(ValueError,
-            'Slice operation expects sequence of bytes',
+            'Slice operation expects either a bytes, a sequence of byte values (0 <= byte <= 255), or anything convertible to bytes',
             setitem, slice(1,2,None), 'a')
+        self.assertRaisesMsg(ValueError,
+            'Slice operation expects either a bytes, a sequence of byte values (0 <= byte <= 255), or anything convertible to bytes',
+            setitem, slice(1,4,None), [1,1.5,2])
+        self.assertRaisesMsg(ValueError,
+            'Slice operation expects either a bytes, a sequence of byte values (0 <= byte <= 255), or anything convertible to bytes',
+            setitem, slice(1,4,None), [1,object(),2])
+        self.assertRaisesMsg(ValueError,
+            'Slice operation expects either a bytes, a sequence of byte values (0 <= byte <= 255), or anything convertible to bytes',
+            setitem, slice(1,2,None), (i/2 for i in range(1)))
+        self.assertRaisesMsg(ValueError,
+            'Slice operation expects either a bytes, a sequence of byte values (0 <= byte <= 255), or anything convertible to bytes',
+            setitem, slice(1,4,None), [1,2,256])
         # ih[0:1] = [1,2,3]
         self.assertRaisesMsg(ValueError,
             'Length of bytes sequence does not match address range',

scripts/bin2hex.py

@@ -35,7 +35,7 @@
 
 '''Intel HEX file format bin2hex convertor utility.'''
 
-VERSION = '2.2.1'
+VERSION = '2.3'
 
 if __name__ == '__main__':
     import getopt

scripts/hex2bin.py

@@ -35,7 +35,7 @@
 
 '''Intel HEX file format hex2bin convertor utility.'''
 
-VERSION = '2.2.1'
+VERSION = '2.3'
 
 if __name__ == '__main__':
     import getopt

scripts/hex2dump.py

@@ -35,7 +35,7 @@
 
 """Show content of hex file as hexdump."""
 
-VERSION = '2.2.1'
+VERSION = '2.3'
 
 USAGE = '''hex2dump: show content of hex file as hexdump.
 Usage:

scripts/hexdiff.py

@@ -37,7 +37,7 @@
 of compared data.
 """
 
-VERSION = '2.2.1'
+VERSION = '2.3'
 
 USAGE = '''hexdiff: diff dumps of 2 hex files.
 Usage: