replace some extras functions with functions from the stable abi

Author: Christopher Doris

src/C/extras.jl

@@ -2,48 +2,45 @@ asptr(x) = Base.unsafe_convert(PyPtr, x)
 
 Py_Type(x) = Base.GC.@preserve x PyPtr(UnsafePtr(asptr(x)).type[!])
 
-PyObject_Type(x) = Base.GC.@preserve x (t = Py_Type(asptr(x)); Py_IncRef(t); t)
-
 Py_TypeCheck(o, t) = Base.GC.@preserve o t PyType_IsSubtype(Py_Type(asptr(o)), asptr(t))
 Py_TypeCheckFast(o, f::Integer) = Base.GC.@preserve o PyType_IsSubtypeFast(Py_Type(asptr(o)), f)
 
-PyType_IsSubtypeFast(t, f::Integer) =
-    Base.GC.@preserve t Cint(!iszero(UnsafePtr{PyTypeObject}(asptr(t)).flags[] & f))
+PyType_IsSubtypeFast(t, f::Integer) = Cint(!iszero(PyType_GetFlags(t) & f))
 
 PyMemoryView_GET_BUFFER(m) = Base.GC.@preserve m Ptr{Py_buffer}(UnsafePtr{PyMemoryViewObject}(asptr(m)).view)
 
 PyType_CheckBuffer(t) = Base.GC.@preserve t begin
-    p = UnsafePtr{PyTypeObject}(asptr(t)).as_buffer[]
-    return p != C_NULL && p.get[!] != C_NULL
+    o = Ref{PyObject}(PyObject(0, asptr(t)))
+    PyObject_CheckBuffer(o)
 end
 
-PyObject_CheckBuffer(o) = Base.GC.@preserve o PyType_CheckBuffer(Py_Type(asptr(o)))
+# PyObject_CheckBuffer(o) = Base.GC.@preserve o PyType_CheckBuffer(Py_Type(asptr(o)))
 
-PyObject_GetBuffer(_o, b, flags) = Base.GC.@preserve _o begin
-    o = asptr(_o)
-    p = UnsafePtr{PyTypeObject}(Py_Type(o)).as_buffer[]
-    if p == C_NULL || p.get[!] == C_NULL
-        PyErr_SetString(
-            POINTERS.PyExc_TypeError,
-            "a bytes-like object is required, not '$(String(UnsafePtr{PyTypeObject}(Py_Type(o)).name[]))'",
-        )
-        return Cint(-1)
-    end
-    return ccall(p.get[!], Cint, (PyPtr, Ptr{Py_buffer}, Cint), o, b, flags)
-end
+# PyObject_GetBuffer(_o, b, flags) = Base.GC.@preserve _o begin
+#     o = asptr(_o)
+#     p = UnsafePtr{PyTypeObject}(Py_Type(o)).as_buffer[]
+#     if p == C_NULL || p.get[!] == C_NULL
+#         PyErr_SetString(
+#             POINTERS.PyExc_TypeError,
+#             "a bytes-like object is required, not '$(String(UnsafePtr{PyTypeObject}(Py_Type(o)).name[]))'",
+#         )
+#         return Cint(-1)
+#     end
+#     return ccall(p.get[!], Cint, (PyPtr, Ptr{Py_buffer}, Cint), o, b, flags)
+# end
 
-PyBuffer_Release(_b) = begin
-    b = UnsafePtr(Base.unsafe_convert(Ptr{Py_buffer}, _b))
-    o = b.obj[]
-    o == C_NULL && return
-    p = UnsafePtr{PyTypeObject}(Py_Type(o)).as_buffer[]
-    if (p != C_NULL && p.release[!] != C_NULL)
-        ccall(p.release[!], Cvoid, (PyPtr, Ptr{Py_buffer}), o, b)
-    end
-    b.obj[] = C_NULL
-    Py_DecRef(o)
-    return
-end
+# PyBuffer_Release(_b) = begin
+#     b = UnsafePtr(Base.unsafe_convert(Ptr{Py_buffer}, _b))
+#     o = b.obj[]
+#     o == C_NULL && return
+#     p = UnsafePtr{PyTypeObject}(Py_Type(o)).as_buffer[]
+#     if (p != C_NULL && p.release[!] != C_NULL)
+#         ccall(p.release[!], Cvoid, (PyPtr, Ptr{Py_buffer}), o, b)
+#     end
+#     b.obj[] = C_NULL
+#     Py_DecRef(o)
+#     return
+# end
 
 function PyOS_SetInputHook(hook::Ptr{Cvoid})
     Base.unsafe_store!(POINTERS.PyOS_InputHookPtr, hook)

src/C/pointers.jl

@@ -72,11 +72,15 @@ const CAPI_FUNC_SIGS = Dict{Symbol,Pair{Tuple,Type}}(
     :PyObject_GetIter => (PyPtr,) => PyPtr,
     :PyObject_Call => (PyPtr, PyPtr, PyPtr) => PyPtr,
     :PyObject_CallObject => (PyPtr, PyPtr) => PyPtr,
+    :PyObject_Type => (PyPtr,) => PyPtr,
+    :PyObject_CheckBuffer => (PyPtr,) => Cint,
+    :PyObject_GetBuffer => (PyPtr, Ptr{Py_buffer}, Cint) => Cint,
     # TYPE
     :PyType_IsSubtype => (PyPtr, PyPtr) => Cint,
     :PyType_Ready => (PyPtr,) => Cint,
     :PyType_GenericNew => (PyPtr, PyPtr, PyPtr) => PyPtr,
     :PyType_FromSpec => (Ptr{Cvoid},) => PyPtr,
+    :PyType_GetFlags => (PyPtr,) => Culong,
     # MAPPING
     :PyMapping_HasKeyString => (PyPtr, Ptr{Cchar}) => Cint,
     :PyMapping_SetItemString => (PyPtr, Ptr{Cchar}, PyPtr) => Cint,
@@ -175,6 +179,8 @@ const CAPI_FUNC_SIGS = Dict{Symbol,Pair{Tuple,Type}}(
     :PyCapsule_SetName => (PyPtr, Ptr{Cchar}) => Cint,
     :PyCapsule_GetPointer => (PyPtr, Ptr{Cchar}) => Ptr{Cvoid},
     :PyCapsule_SetDestructor => (PyPtr, Ptr{Cvoid}) => Cint,
+    # BUFFER
+    :PyBuffer_Release => (Ptr{Py_buffer},) => Cvoid,
 )
 
 const CAPI_EXCEPTIONS = Set([

src/Convert/pyconvert.jl

@@ -230,7 +230,7 @@ function _pyconvert_get_rules(pytype::Py)
         end
     end
     for (t, x) in reverse(collect(zip(mro, xmro)))
-        if C.PyType_CheckBuffer(t)
+        if C.PyType_CheckBuffer(t) == 1
             push!(x, "<buffer>")
             break
         end

src/Wrap/PyArray.jl

@@ -83,7 +83,7 @@ function pyarray_make(
             @debug "failed to make PyArray from __array_interface__" exc = exc
         end
     end
-    if buffer && C.PyObject_CheckBuffer(x)
+    if buffer && C.PyObject_CheckBuffer(x) == 1
         try
             return pyarray_make(A, x, PyArraySource_Buffer(x))
         catch exc