gh-130928: Fix error message during bytes formatting for the 'i' flag (#130967)

ApostolFet · web-flow · commit 7c3692fe2750 · 2025-03-24T22:07:03.000+03:00
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -5,6 +5,7 @@
 """
 
 import array
+import operator
 import os
 import re
 import sys
@@ -771,6 +772,9 @@ def check(fmt, vals, result):
         check(b'%i%b %*.*b', (10, b'3', 5, 3, b'abc',), b'103   abc')
         check(b'%c', b'a', b'a')
 
+        self.assertRaisesRegex(TypeError, '%i format: a real number is required, not complex', operator.mod, '%i', 2j)
+        self.assertRaisesRegex(TypeError, '%d format: a real number is required, not complex', operator.mod, '%d', 2j)
+
     def test_imod(self):
         b = self.type2test(b'hello, %b!')
         orig = b
diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
@@ -283,6 +283,10 @@ def test_common_format(self):
                         "%x format: an integer is required, not str")
         test_exc_common('%x', 3.14, TypeError,
                         "%x format: an integer is required, not float")
+        test_exc_common('%i', '1', TypeError,
+                        "%i format: a real number is required, not str")
+        test_exc_common('%i', b'1', TypeError,
+                        "%i format: a real number is required, not bytes")
 
     def test_str_format(self):
         testformat("%r", "\u0378", "'\\u0378'")  # non printable
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-03-09-09-03-24.gh-issue-130928.gP1yKv.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-03-09-09-03-24.gh-issue-130928.gP1yKv.rst
@@ -0,0 +1,2 @@
+Fix error message when formatting bytes using the ``'i'`` flag.
+Patch by Maxim Ageev.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -469,8 +469,6 @@ static PyObject *
 formatlong(PyObject *v, int flags, int prec, int type)
 {
     PyObject *result, *iobj;
-    if (type == 'i')
-        type = 'd';
     if (PyLong_Check(v))
         return _PyUnicode_FormatLong(v, flags & F_ALT, prec, type);
     if (PyNumber_Check(v)) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix error message when formatting bytes using the ``'i'`` flag.
	`2`	`+Patch by Maxim Ageev.`
Original file line number	Diff line number	Diff line change
`@@ -469,8 +469,6 @@ static PyObject *`
`469`	`469`	`formatlong(PyObject *v, int flags, int prec, int type)`
`470`	`470`	`{`
`471`	`471`	`PyObject result, iobj;`
`472`		`- if (type == 'i')`
`473`		`- type = 'd';`
`474`	`472`	`if (PyLong_Check(v))`
`475`	`473`	`return _PyUnicode_FormatLong(v, flags & F_ALT, prec, type);`
`476`	`474`	`if (PyNumber_Check(v)) {`