https://github.com/python/cpython/commit/66680f1230e51b8274279964f8d2278d12285eb3
commit: 66680f1230e51b8274279964f8d2278d12285eb3
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2026-01-16T11:24:43Z
summary:
gh-143672: Add more tests for struct.pack_into() (GH-143901)
Add tests for negative offset, out of bound offset, invalid type of offset,
non-writeable buffer, non-continuous buffer, invalid type of buffer.
Repeat all tests for struct.Struct.pack_into().
files:
M Lib/test/test_struct.py
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index 88662fec60fe4a..59133e24e649fa 100644
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -433,56 +433,63 @@ def test_unpack_from(self):
self.assertEqual(s.unpack_from(buffer=test_string, offset=2),
(b'cd01',))
- def test_pack_into(self):
+ def _test_pack_into(self, pack_into):
test_string = b'Reykjavik rocks, eow!'
- writable_buf = array.array('b', b' '*100)
- fmt = '21s'
- s = struct.Struct(fmt)
+ writable_buf = memoryview(array.array('b', b' '*100))
# Test without offset
- s.pack_into(writable_buf, 0, test_string)
+ pack_into(writable_buf, 0, test_string)
from_buf = writable_buf.tobytes()[:len(test_string)]
self.assertEqual(from_buf, test_string)
# Test with offset.
- s.pack_into(writable_buf, 10, test_string)
+ pack_into(writable_buf, 10, test_string)
from_buf = writable_buf.tobytes()[:len(test_string)+10]
self.assertEqual(from_buf, test_string[:10] + test_string)
+ # Test with negative offset.
+ pack_into(writable_buf, -30, test_string)
+ from_buf = writable_buf.tobytes()[-30:-30+len(test_string)]
+ self.assertEqual(from_buf, test_string)
+
# Go beyond boundaries.
small_buf = array.array('b', b' '*10)
- self.assertRaises((ValueError, struct.error), s.pack_into, small_buf,
0,
- test_string)
- self.assertRaises((ValueError, struct.error), s.pack_into, small_buf,
2,
- test_string)
+ with self.assertRaises((ValueError, struct.error)):
+ pack_into(small_buf, 0, test_string)
+ with self.assertRaises((ValueError, struct.error)):
+ pack_into(writable_buf, 90, test_string)
+ with self.assertRaises((ValueError, struct.error)):
+ pack_into(writable_buf, -10, test_string)
+ with self.assertRaises((ValueError, struct.error)):
+ pack_into(writable_buf, 150, test_string)
+ with self.assertRaises((ValueError, struct.error)):
+ pack_into(writable_buf, -150, test_string)
+
+ # Test invalid buffer.
+ self.assertRaises(TypeError, pack_into, b' '*100, 0, test_string)
+ self.assertRaises(TypeError, pack_into, ' '*100, 0, test_string)
+ self.assertRaises(TypeError, pack_into, [0]*100, 0, test_string)
+ self.assertRaises(TypeError, pack_into, None, 0, test_string)
+ self.assertRaises(TypeError, pack_into, writable_buf[::2], 0,
test_string)
+ self.assertRaises(TypeError, pack_into, writable_buf[::-1], 0,
test_string)
+
+ # Test bogus offset (issue bpo-3694)
+ with self.assertRaises(TypeError):
+ pack_into(writable_buf, None, test_string)
+ with self.assertRaises(TypeError):
+ pack_into(writable_buf, 0.0, test_string)
+ with self.assertRaises((IndexError, OverflowError)):
+ pack_into(writable_buf, 2**1000, test_string)
+ with self.assertRaises((IndexError, OverflowError)):
+ pack_into(writable_buf, -2**1000, test_string)
- # Test bogus offset (issue 3694)
- sb = small_buf
- self.assertRaises((TypeError, struct.error), struct.pack_into, b'', sb,
- None)
+ def test_pack_into(self):
+ s = struct.Struct('21s')
+ self._test_pack_into(s.pack_into)
def test_pack_into_fn(self):
- test_string = b'Reykjavik rocks, eow!'
- writable_buf = array.array('b', b' '*100)
- fmt = '21s'
- pack_into = lambda *args: struct.pack_into(fmt, *args)
-
- # Test without offset.
- pack_into(writable_buf, 0, test_string)
- from_buf = writable_buf.tobytes()[:len(test_string)]
- self.assertEqual(from_buf, test_string)
-
- # Test with offset.
- pack_into(writable_buf, 10, test_string)
- from_buf = writable_buf.tobytes()[:len(test_string)+10]
- self.assertEqual(from_buf, test_string[:10] + test_string)
-
- # Go beyond boundaries.
- small_buf = array.array('b', b' '*10)
- self.assertRaises((ValueError, struct.error), pack_into, small_buf, 0,
- test_string)
- self.assertRaises((ValueError, struct.error), pack_into, small_buf, 2,
- test_string)
+ pack_into = lambda *args: struct.pack_into('21s', *args)
+ self._test_pack_into(pack_into)
def test_unpack_with_buffer(self):
# SF bug 1563759: struct.unpack doesn't support buffer protocol objects
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
