54d97251fe
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
124 lines
2.7 KiB
Python
124 lines
2.7 KiB
Python
try:
|
|
import ustruct as struct
|
|
except:
|
|
try:
|
|
import struct
|
|
except ImportError:
|
|
print("SKIP")
|
|
raise SystemExit
|
|
|
|
print(struct.calcsize("<bI"))
|
|
print(struct.unpack("<bI", b"\x80\0\0\x01\0"))
|
|
print(struct.calcsize(">bI"))
|
|
print(struct.unpack(">bI", b"\x80\0\0\x01\0"))
|
|
|
|
# 32-bit little-endian specific
|
|
#print(struct.unpack("bI", b"\x80\xaa\x55\xaa\0\0\x01\0"))
|
|
|
|
print(struct.pack("<l", 1))
|
|
print(struct.pack(">l", 1))
|
|
print(struct.pack("<i", 1))
|
|
print(struct.pack(">i", 1))
|
|
print(struct.pack("<h", 1))
|
|
print(struct.pack(">h", 1))
|
|
print(struct.pack("<b", 1))
|
|
print(struct.pack(">b", 1))
|
|
|
|
print(struct.pack("<bI", -128, 256))
|
|
print(struct.pack(">bI", -128, 256))
|
|
|
|
print(struct.calcsize("100sI"))
|
|
print(struct.calcsize("97sI"))
|
|
print(struct.unpack("<6sH", b"foo\0\0\0\x12\x34"))
|
|
print(struct.pack("<6sH", b"foo", 10000))
|
|
|
|
s = struct.pack("BHBI", 10, 100, 200, 300)
|
|
v = struct.unpack("BHBI", s)
|
|
print(v == (10, 100, 200, 300))
|
|
|
|
# network byte order
|
|
print(struct.pack('!i', 123))
|
|
|
|
# too short / too long arguments
|
|
buf = bytearray(b'>>>123<<<')
|
|
try:
|
|
struct.pack_into('bb', buf, 0, 3)
|
|
except:
|
|
print('struct.error')
|
|
|
|
try:
|
|
struct.pack_into('bb', buf, 0, 3, 1, 4)
|
|
except:
|
|
print('struct.error')
|
|
|
|
try:
|
|
struct.pack('bb', 3)
|
|
except:
|
|
print('struct.error')
|
|
|
|
try:
|
|
struct.pack('bb', 3, 1, 4)
|
|
except:
|
|
print('struct.error')
|
|
|
|
# check that we get an error if the buffer is too small
|
|
try:
|
|
struct.unpack('I', b'\x00\x00\x00')
|
|
except:
|
|
print('struct.error')
|
|
|
|
# first arg must be a string
|
|
try:
|
|
struct.pack(1, 2)
|
|
except TypeError:
|
|
print('TypeError')
|
|
|
|
# make sure that unknown types are detected
|
|
try:
|
|
struct.pack("z", 1)
|
|
except:
|
|
print("Unknown type")
|
|
|
|
# Initially repitition counters were supported only for strings,
|
|
# but later were implemented for all.
|
|
print(struct.unpack("<3B2h", b"foo\x12\x34\xff\xff"))
|
|
print(struct.pack("<3B", 1, 2, 3))
|
|
|
|
# pack_into
|
|
buf = bytearray(b'>>>123<<<')
|
|
struct.pack_into('<bbb', buf, 3, 0x41, 0x42, 0x43)
|
|
print(buf)
|
|
struct.pack_into('<bbb', buf, -6, 0x44, 0x45, 0x46)
|
|
print(buf)
|
|
|
|
# check that we get an error if the buffer is too small
|
|
try:
|
|
struct.pack_into('I', bytearray(1), 0, 0)
|
|
except:
|
|
print('struct.error')
|
|
|
|
try:
|
|
struct.pack_into('<bbb', buf, 7, 0x41, 0x42, 0x43)
|
|
except:
|
|
print('struct.error')
|
|
try:
|
|
struct.pack_into('<bbb', buf, -10, 0x41, 0x42, 0x43)
|
|
except:
|
|
print('struct.error')
|
|
|
|
# unpack_from
|
|
buf = b'0123456789'
|
|
print(struct.unpack_from('<b', buf, 4))
|
|
print(struct.unpack_from('<b', buf, -4))
|
|
try:
|
|
print(struct.unpack_from('<b', buf, 10))
|
|
except:
|
|
print('struct.error')
|
|
try:
|
|
print(struct.unpack_from('<b', buf, -11))
|
|
except:
|
|
print('struct.error')
|
|
|
|
# check padding bytes
|
|
print(struct.pack("xb", 3))
|