[Python-checkins] bpo-45034: Fix how upper limit is formatted for `struct.pack("H", ...)` (GH-28178)
mdickinson
webhook-mailer at python.org
Tue Sep 7 08:18:51 EDT 2021
https://github.com/python/cpython/commit/8ca6b61e3fd7f1e2876126cee82da8d812c8462f
commit: 8ca6b61e3fd7f1e2876126cee82da8d812c8462f
branch: main
author: Nikita Sobolev <mail at sobolevn.me>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-09-07T13:18:46+01:00
summary:
bpo-45034: Fix how upper limit is formatted for `struct.pack("H", ...)` (GH-28178)
Co-authored-by: Mark Dickinson <dickinsm at gmail.com>
Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>
files:
A Misc/NEWS.d/next/Library/2021-09-05-20-33-25.bpo-45034.62NLD5.rst
M Lib/test/test_struct.py
M Misc/ACKS
M Modules/_struct.c
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index b3f21ea7db49e..49decacb132f8 100644
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -678,6 +678,24 @@ def test_issue35714(self):
'embedded null character'):
struct.calcsize(s)
+ @support.cpython_only
+ def test_issue45034_unsigned(self):
+ from _testcapi import USHRT_MAX
+ error_msg = f'ushort format requires 0 <= number <= {USHRT_MAX}'
+ with self.assertRaisesRegex(struct.error, error_msg):
+ struct.pack('H', 70000) # too large
+ with self.assertRaisesRegex(struct.error, error_msg):
+ struct.pack('H', -1) # too small
+
+ @support.cpython_only
+ def test_issue45034_signed(self):
+ from _testcapi import SHRT_MIN, SHRT_MAX
+ error_msg = f'short format requires {SHRT_MIN} <= number <= {SHRT_MAX}'
+ with self.assertRaisesRegex(struct.error, error_msg):
+ struct.pack('h', 70000) # too large
+ with self.assertRaisesRegex(struct.error, error_msg):
+ struct.pack('h', -70000) # too small
+
class UnpackIteratorTest(unittest.TestCase):
"""
diff --git a/Misc/ACKS b/Misc/ACKS
index df0b92c72df86..481e46d4c1732 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1663,6 +1663,7 @@ Ryan Smith-Roberts
Rafal Smotrzyk
Josh Snider
Eric Snow
+Nikita Sobolev
Dirk Soede
Nir Soffer
Paul Sokolovsky
diff --git a/Misc/NEWS.d/next/Library/2021-09-05-20-33-25.bpo-45034.62NLD5.rst b/Misc/NEWS.d/next/Library/2021-09-05-20-33-25.bpo-45034.62NLD5.rst
new file mode 100644
index 0000000000000..8d94821470a2a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-09-05-20-33-25.bpo-45034.62NLD5.rst
@@ -0,0 +1,2 @@
+Changes how error is formatted for ``struct.pack`` with ``'H'`` and ``'h'`` modes and
+too large / small numbers. Now it shows the actual numeric limits, while previously it was showing arithmetic expressions.
diff --git a/Modules/_struct.c b/Modules/_struct.c
index 30ad9f2b79d8f..872c30d659d82 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -589,9 +589,9 @@ np_short(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
if (get_long(state, v, &x) < 0)
return -1;
if (x < SHRT_MIN || x > SHRT_MAX) {
- PyErr_SetString(state->StructError,
- "short format requires " Py_STRINGIFY(SHRT_MIN)
- " <= number <= " Py_STRINGIFY(SHRT_MAX));
+ PyErr_Format(state->StructError,
+ "short format requires %d <= number <= %d",
+ (int)SHRT_MIN, (int)SHRT_MAX);
return -1;
}
y = (short)x;
@@ -607,9 +607,9 @@ np_ushort(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
if (get_long(state, v, &x) < 0)
return -1;
if (x < 0 || x > USHRT_MAX) {
- PyErr_SetString(state->StructError,
- "ushort format requires 0 <= number <= "
- Py_STRINGIFY(USHRT_MAX));
+ PyErr_Format(state->StructError,
+ "ushort format requires 0 <= number <= %u",
+ (unsigned int)USHRT_MAX);
return -1;
}
y = (unsigned short)x;
More information about the Python-checkins
mailing list