Merge branch 'main' into make-linecache-clearcache-thread-and-gc-reen…

…trant-safe
graingert · Dec 4, 2024 · b98e7ed · b98e7ed
2 parents 535695e + 6fc6436
commit b98e7ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Lib/test/test_capi/test_structmembers.py b/Lib/test/test_capi/test_structmembers.py
@@ -39,7 +39,7 @@ def _make_test_object(cls):
                "hi",   # T_STRING_INPLACE
                12,     # T_LONGLONG
                13,     # T_ULONGLONG
-               "c",    # T_CHAR
+               b"c",   # T_CHAR
                )
 
 

diff --git a/Modules/_testcapi/structmember.c b/Modules/_testcapi/structmember.c
@@ -60,7 +60,7 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
         "T_FLOAT", "T_DOUBLE", "T_STRING_INPLACE",
         "T_LONGLONG", "T_ULONGLONG", "T_CHAR",
         NULL};
-    static const char fmt[] = "|bbBhHiIlknfds#LKC";
+    static const char fmt[] = "|bbBhHiIlknfds#LKc";
     test_structmembers *ob;
     const char *s = NULL;
     Py_ssize_t string_len = 0;