[3.11] pythongh-104018: disallow "z" format specifier in %-format of …

…byte strings (pythonGH-104033) (python#104058) pythongh-104018: disallow "z" format specifier in %-format of byte strings (pythonGH-104033) PEP-0682 specified that %-formatting would not support the "z" specifier, but it was unintentionally allowed for bytes. This PR makes use of the "z" flag an error for %-formatting in a bytestring. Issue: pythonGH-104018 --------- (cherry picked from commit 3ed8c88) Co-authored-by: John Belmonte <john@neggie.net> Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
miss-islington · May 1, 2023 · 10db28b · 10db28b
1 parent 723aacb
commit 10db28b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
@@ -619,6 +619,8 @@ def test_specifier_z_error(self):
         error_msg = re.escape("unsupported format character 'z'")
         with self.assertRaisesRegex(ValueError, error_msg):
             "%z.1f" % 0  # not allowed in old style string interpolation
+        with self.assertRaisesRegex(ValueError, error_msg):
+            b"%z.1f" % 0
 
 
 if __name__ == "__main__":

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-05-01-12-03-52.gh-issue-104018.PFxGS4.rst b/Misc/NEWS.d/next/Core and Builtins/2023-05-01-12-03-52.gh-issue-104018.PFxGS4.rst
@@ -0,0 +1 @@
+Disallow the "z" format specifier in %-format of bytes objects.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -714,7 +714,6 @@ _PyBytes_FormatEx(const char *format, Py_ssize_t format_len,
                 case ' ': flags |= F_BLANK; continue;
                 case '#': flags |= F_ALT; continue;
                 case '0': flags |= F_ZERO; continue;
-                case 'z': flags |= F_NO_NEG_0; continue;
                 }
                 break;
             }