Address Gregory's review

* array: add missing 'e' format in an error message
* memoryview: get_native_fmtstr() checks that fmt[1] is not NUL
* ctypes: update error message
* Fix typo

Author: vstinner

Doc/whatsnew/3.15.rst

@@ -721,7 +721,7 @@ array
 -----
 
 * Support the :c:expr:`float complex` and :c:expr:`double complex` C types:
-  formatting characters ``'F'``/``'Zd'`` and ``'D'``/``'Zd'`` respectively.
+  formatting characters ``'F'``/``'Zf'`` and ``'D'``/``'Zd'`` respectively.
   (Contributed by Sergey B Kirpichev and Victor Stinner in :gh:`146151`
   and :gh:`148675`.)
 

Modules/_ctypes/_ctypes.c

@@ -2376,17 +2376,15 @@ PyCSimpleType_init(PyObject *self, PyObject *args, PyObject *kwds)
         if (complex_formats) {
             PyErr_Format(PyExc_AttributeError,
                          "class must define a '_type_' attribute which must be\n"
-                         "a single character string containing one of the\n"
-                         "supported types: '%s', or one of these strings:\n"
-                         "%s.",
+                         "one of these characters: '%s',\n"
+                         "or one of these strings: %s.",
                          _ctypes_get_simple_type_chars(),
                          complex_formats);
         }
         else {
             PyErr_Format(PyExc_AttributeError,
                          "class must define a '_type_' attribute which must be\n"
-                         "a single character string containing one of the\n"
-                         "supported types: '%s'.\n",
+                         "one of these characters: '%s'.\n",
                          _ctypes_get_simple_type_chars());
         }
         goto error;

Modules/_ctypes/cfield.c

@@ -1818,6 +1818,16 @@ for code in 'sbBcdgfhHiIlLqQPzuUXvO':
     if (!result || !result->code) {
         return NULL;
     }
+    if (fmt[1] != '\0') {
+        if (fmt[0] == 'Z') {
+            if (fmt[2] != '\0') {
+                return NULL;
+            }
+        }
+        else {
+            return NULL;
+        }
+    }
     assert(result->pffi_type);
     assert(result->setfunc);
     assert(result->getfunc);

Modules/arraymodule.c

@@ -3167,7 +3167,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     }
     Py_XDECREF(it);
     PyErr_SetString(PyExc_ValueError,
-        "bad typecode (must be b, B, u, w, h, H, i, I, l, L, q, Q, f, d, F, D, Zd or Zf)");
+        "bad typecode (must be b, B, u, w, h, H, i, I, l, L, q, Q, e, f, d, F, D, Zf or Zd)");
     return NULL;
 }
 

Objects/memoryobject.c

@@ -281,7 +281,7 @@ last_dim_is_contiguous(const Py_buffer *dest, const Py_buffer *src)
 /* This is not a general function for determining format equivalence.
    It is used in copy_single() and copy_buffer() to weed out non-matching
    formats. Skipping the '@' character is specifically used in slice
-   assignments, where the lvalue is already known to have a single character
+   assignments, where the lvalue is already known to have a
    format. This is a performance hack that could be rewritten (if properly
    benchmarked). */
 static inline int
@@ -1255,7 +1255,7 @@ get_native_fmtstr(const char *fmt)
         return NULL;
     }
     if (fmt[0] == 'Z') {
-        if (fmt[2] != '\0') {
+        if (fmt[1] == '\0' || fmt[2] != '\0') {
             return NULL;
         }
     }
@@ -1327,8 +1327,8 @@ cast_to_1D(PyMemoryViewObject *mv, PyObject *format)
     itemsize = get_native_fmtchar(&destfmt, PyBytes_AS_STRING(asciifmt));
     if (itemsize < 0) {
         PyErr_SetString(PyExc_ValueError,
-            "memoryview: destination format must be a native single "
-            "character format prefixed with an optional '@'");
+            "memoryview: destination format must be a native "
+            "format prefixed with an optional '@'");
         goto out;
     }