Add PyBuffer APIs.

Author: brandtbucher

generate.py

@@ -70,6 +70,8 @@
     ("PyArg_ValidateKeywordArguments", "O", "i"),
     ("PyBool_Check", "O", "i"),
     ("PyBool_FromLong", "l", "N"),
+    ("PyBuffer_IsContiguous", "y*c", "i"),
+    ("PyBuffer_Release", "y*", ""),
     ("PyByteArray_AS_STRING", "O", "y"),
     ("PyByteArray_AsString", "O", "y"),
     ("PyByteArray_Check", "O", "i"),
@@ -869,6 +871,7 @@
     "O": "object",
     "u": "str",
     "y": "bytes",
+    "y*": "bytes",
 }
 
 RETURN_TYPES_PYI = {
@@ -902,6 +905,7 @@
     "O": "PyObject*",
     "u": "wchar_t*",
     "y": "char*",
+    "y*": "Py_buffer*",
 }
 
 RETURN_TYPES_C = {
@@ -938,6 +942,8 @@
     "y": "return PyBytes_FromString(result);",
 }
 
+EXTRAS = {"*"}
+
 FUNCTIONDEF = """\
 static PyObject* capi_{}(PyObject* Py_UNUSED(self), PyObject* {}) {{
 {}
@@ -1118,9 +1124,16 @@
 
 def build_stub(api: str, arg_types: str, return_type: str) -> str:
 
+    preprocessed_args: typing.List[str] = []
+    for index, code in enumerate(arg_types):
+        if code in EXTRAS:
+            preprocessed_args[-1] = arg_types[index - 1] + code
+        else:
+            preprocessed_args.append(code)
+
     args_str = ", ".join(
         "__{}: {}".format(arg, ARG_TYPES_PYI[annotation])
-        for arg, annotation in enumerate(arg_types)
+        for arg, annotation in enumerate(preprocessed_args)
     )
     return_str = RETURN_TYPES_PYI[return_type]
 
@@ -1136,11 +1149,18 @@ def build_definition(api: str, arg_types: str, return_type: str) -> str:
 
     body: typing.List[str] = []
 
+    preprocessed_args: typing.List[str] = []
+    for index, code in enumerate(arg_types):
+        if code in EXTRAS:
+            preprocessed_args[-1] = arg_types[index - 1] + code
+        else:
+            preprocessed_args.append(code)
+
     if arg_types and arg_types != "O":
         body.append("")
         body.extend(
             "{} arg{};".format(ARG_TYPES_C[annotation], arg)
-            for arg, annotation in enumerate(arg_types)
+            for arg, annotation in enumerate(preprocessed_args)
         )
     if return_type:
         body.append("")
@@ -1154,15 +1174,19 @@ def build_definition(api: str, arg_types: str, return_type: str) -> str:
                     api,
                     len(arg_types),
                     len(arg_types),
-                    "".join(", &arg{}".format(arg) for arg in range(len(arg_types))),
+                    "".join(
+                        ", &arg{}".format(arg) for arg in range(len(preprocessed_args))
+                    ),
                 )
             )
         else:
             body.append(
                 'if (!PyArg_ParseTuple(args, "{}:{}"{})) {{'.format(
                     arg_types,
                     api,
-                    "".join(", &arg{}".format(arg) for arg in range(len(arg_types))),
+                    "".join(
+                        ", &arg{}".format(arg) for arg in range(len(preprocessed_args))
+                    ),
                 )
             )
         body.append(INDENT + "return NULL;")
@@ -1173,7 +1197,7 @@ def build_definition(api: str, arg_types: str, return_type: str) -> str:
         body.append(
             "result = {}({});".format(
                 api,
-                ", ".join("arg{}".format(arg) for arg in range(len(arg_types)))
+                ", ".join("arg{}".format(arg) for arg in range(len(preprocessed_args)))
                 if arg_types != "O"
                 else "arg",
             )
@@ -1183,7 +1207,7 @@ def build_definition(api: str, arg_types: str, return_type: str) -> str:
         body.append(
             "{}({});".format(
                 api,
-                ", ".join("arg{}".format(arg) for arg in range(len(arg_types)))
+                ", ".join("arg{}".format(arg) for arg in range(len(preprocessed_args)))
                 if arg_types != "O"
                 else "arg",
             )

pycapi.c

@@ -871,6 +871,45 @@ static PyObject* capi_PyBool_FromLong(PyObject* Py_UNUSED(self), PyObject* args)
     return result;
 }
 
+/* PyBuffer */
+
+static PyObject* capi_PyBuffer_IsContiguous(PyObject* Py_UNUSED(self), PyObject* args) {
+
+    Py_buffer* arg0;
+    char arg1;
+
+    int result;
+
+    if (!PyArg_ParseTuple(args, "y*c:PyBuffer_IsContiguous", &arg0, &arg1)) {
+        return NULL;
+    }
+
+    result = PyBuffer_IsContiguous(arg0, arg1);
+
+    if (PyErr_Occurred()) {
+        return NULL;
+    }
+
+    return PyLong_FromLong(result);
+}
+
+static PyObject* capi_PyBuffer_Release(PyObject* Py_UNUSED(self), PyObject* args) {
+
+    Py_buffer* arg0;
+
+    if (!PyArg_ParseTuple(args, "y*:PyBuffer_Release", &arg0)) {
+        return NULL;
+    }
+
+    PyBuffer_Release(arg0);
+
+    if (PyErr_Occurred()) {
+        return NULL;
+    }
+
+    Py_RETURN_NONE;
+}
+
 /* PyByteArray */
 
 static PyObject* capi_PyByteArray_AS_STRING(PyObject* Py_UNUSED(self), PyObject* arg) {
@@ -11715,6 +11754,11 @@ static PyMethodDef CAPIMethods[] =  {
     {"PyBool_Check", capi_PyBool_Check, METH_O, NULL},
     {"PyBool_FromLong", capi_PyBool_FromLong, METH_VARARGS, NULL},
 
+    /* PyBuffer */
+
+    {"PyBuffer_IsContiguous", capi_PyBuffer_IsContiguous, METH_VARARGS, NULL},
+    {"PyBuffer_Release", capi_PyBuffer_Release, METH_VARARGS, NULL},
+
     /* PyByteArray */
 
     {"PyByteArray_AS_STRING", capi_PyByteArray_AS_STRING, METH_O, NULL},

pycapi.pyi

@@ -72,6 +72,11 @@ def PyArg_ValidateKeywordArguments(__0: object) -> int: ...
 def PyBool_Check(__0: object) -> int: ...
 def PyBool_FromLong(__0: int) -> typing.Any: ...
 
+# PyBuffer
+
+def PyBuffer_IsContiguous(__0: bytes, __1: bytes) -> int: ...
+def PyBuffer_Release(__0: bytes) -> None: ...
+
 # PyByteArray
 
 def PyByteArray_AS_STRING(__0: object) -> typing.Optional[bytes]: ...

setup.py

@@ -18,5 +18,5 @@
         long_description_content_type="text/markdown",
         name="pycapi",
         url="https://github.com/brandtbucher/pycapi",
-        version="0.74.0",
+        version="0.75.0",
     )