remove PyTypeObject

Author: MilesCranmer

src/C/consts.jl

@@ -249,81 +249,6 @@ end
     weakreflist::PyPtr = PyNULL
 end
 
-@kwdef struct PyTypeObject
-    ob_base::PyVarObject = PyVarObject()
-    name::Cstring = C_NULL
-
-    basicsize::Py_ssize_t = 0
-    itemsize::Py_ssize_t = 0
-
-    dealloc::Ptr{Cvoid} = C_NULL
-    vectorcall_offset::Py_ssize_t = 0
-    getattr::Ptr{Cvoid} = C_NULL
-    setattr::Ptr{Cvoid} = C_NULL
-    as_async::Ptr{Cvoid} = C_NULL
-    repr::Ptr{Cvoid} = C_NULL
-
-    as_number::Ptr{PyNumberMethods} = C_NULL
-    as_sequence::Ptr{PySequenceMethods} = C_NULL
-    as_mapping::Ptr{PyMappingMethods} = C_NULL
-
-    hash::Ptr{Cvoid} = C_NULL
-    call::Ptr{Cvoid} = C_NULL
-    str::Ptr{Cvoid} = C_NULL
-    getattro::Ptr{Cvoid} = C_NULL
-    setattro::Ptr{Cvoid} = C_NULL
-
-    as_buffer::Ptr{PyBufferProcs} = C_NULL
-
-    flags::Culong = 0
-
-    doc::Cstring = C_NULL
-
-    traverse::Ptr{Cvoid} = C_NULL
-
-    clear::Ptr{Cvoid} = C_NULL
-
-    richcompare::Ptr{Cvoid} = C_NULL
-
-    weaklistoffset::Py_ssize_t = 0
-
-    iter::Ptr{Cvoid} = C_NULL
-    iternext::Ptr{Cvoid} = C_NULL
-
-    methods::Ptr{PyMethodDef} = C_NULL
-    members::Ptr{PyMemberDef} = C_NULL
-    getset::Ptr{PyGetSetDef} = C_NULL
-    base::PyPtr = C_NULL
-    dict::PyPtr = C_NULL
-    descr_get::Ptr{Cvoid} = C_NULL
-    descr_set::Ptr{Cvoid} = C_NULL
-    dictoffset::Py_ssize_t = 0
-    init::Ptr{Cvoid} = C_NULL
-    alloc::Ptr{Cvoid} = C_NULL
-    new::Ptr{Cvoid} = C_NULL
-    free::Ptr{Cvoid} = C_NULL
-    is_gc::Ptr{Cvoid} = C_NULL
-    bases::PyPtr = C_NULL
-    mro::PyPtr = C_NULL
-    cache::PyPtr = C_NULL
-    subclasses::PyPtr = C_NULL
-    weaklist::PyPtr = C_NULL
-    del::Ptr{Cvoid} = C_NULL
-
-    version_tag::Cuint = 0
-
-    finalize::Ptr{Cvoid} = C_NULL
-    vectorcall::Ptr{Cvoid} = C_NULL
-
-    # Python 3.12+ fields
-    tp_watched::Cchar = 0
-    
-    # Python 3.13+ fields  
-    tp_versions_used::Cushort = 0
-end
-
-const PyTypePtr = Ptr{PyTypeObject}
-
 @kwdef struct PyType_Slot
     slot::Cint = 0
     pfunc::Ptr{Cvoid} = C_NULL

src/C/extras.jl

@@ -10,6 +10,20 @@ Py_TypeCheckFast(o, f::Integer) = Base.GC.@preserve o PyType_IsSubtypeFast(Py_Ty
 PyType_IsSubtypeFast(t, f::Integer) =
     Base.GC.@preserve t Cint(!iszero(PyType_GetFlags(asptr(t)) & f))
 
+function pytypename(t::PyPtr)
+    name_obj = PyObject_GetAttrString(t, "__name__")
+    name_obj == C_NULL && return "(unknown type)"
+    cstr = PyUnicode_AsUTF8(name_obj)
+    if cstr == C_NULL
+        Py_DecRef(name_obj)
+        return "(unknown type)"
+    else
+        str = unsafe_string(cstr)
+        Py_DecRef(name_obj)
+        return str
+    end
+end
+
 PyMemoryView_GET_BUFFER(m) = Base.GC.@preserve m Ptr{Py_buffer}(UnsafePtr{PyMemoryViewObject}(asptr(m)).view)
 
 PyType_CheckBuffer(t) = Base.GC.@preserve t begin
@@ -25,7 +39,7 @@ PyObject_GetBuffer(_o, b, flags) = Base.GC.@preserve _o begin
     if getbuf == C_NULL
         PyErr_SetString(
             POINTERS.PyExc_TypeError,
-            "a bytes-like object is required, not '$(String(UnsafePtr{PyTypeObject}(Py_Type(o)).name[]))'",
+            "a bytes-like object is required, not '$(pytypename(Py_Type(o)))'",
         )
         return Cint(-1)
     end

src/C/pointers.jl

@@ -144,6 +144,7 @@ const CAPI_FUNC_SIGS = Dict{Symbol,Pair{Tuple,Type}}(
     :PyComplex_AsCComplex => (PyPtr,) => Py_complex,
     # STR
     :PyUnicode_DecodeUTF8 => (Ptr{Cchar}, Py_ssize_t, Ptr{Cchar}) => PyPtr,
+    :PyUnicode_AsUTF8 => (PyPtr,) => Ptr{Cchar},
     :PyUnicode_AsUTF8String => (PyPtr,) => PyPtr,
     :PyUnicode_InternInPlace => (Ptr{PyPtr},) => Cvoid,
     # BYTES