Fix _ctypes.Array base and metacalss

youknowone · youknowone · commit 3edd75a711ac · 2025-03-25T09:49:09.000+09:00
diff --git a/extra_tests/snippets/stdlib_ctypes.py b/extra_tests/snippets/stdlib_ctypes.py
@@ -3,12 +3,15 @@
 
 from _ctypes import RTLD_LOCAL, RTLD_GLOBAL
 from _ctypes import sizeof
-from _ctypes import _SimpleCData
+from _ctypes import _SimpleCData, Array
 from _ctypes import CFuncPtr as _CFuncPtr
 
 from struct import calcsize as _calcsize
 
 
+assert Array.__class__.__name__ == 'PyCArrayType'
+assert Array.__base__.__name__ == '_CData'
+
 DEFAULT_MODE = RTLD_LOCAL
 if _os.name == "posix" and _sys.platform == "darwin":
     # On OS X 10.3, we use RTLD_GLOBAL as default mode
diff --git a/vm/src/stdlib/ctypes/array.rs b/vm/src/stdlib/ctypes/array.rs
@@ -1,13 +1,16 @@
 use crate::builtins::PyBytes;
 use crate::types::Callable;
 use crate::{Py, PyObjectRef, PyPayload};
-use crate::{PyResult, VirtualMachine, builtins::PyTypeRef, types::Constructor};
+use crate::{
+    PyResult, VirtualMachine,
+    builtins::{PyType, PyTypeRef},
+    types::Constructor,
+};
 use crossbeam_utils::atomic::AtomicCell;
 use rustpython_common::lock::PyRwLock;
-use rustpython_vm::stdlib::ctypes::base::PyCSimple;
+use rustpython_vm::stdlib::ctypes::base::PyCData;
 
-// TODO: make it metaclass
-#[pyclass(name = "ArrayType", module = "_ctypes")]
+#[pyclass(name = "PyCArrayType", base = "PyType", module = "_ctypes")]
 #[derive(PyPayload)]
 pub struct PyCArrayType {
     pub(super) inner: PyCArray,
@@ -44,7 +47,12 @@ impl Constructor for PyCArrayType {
 #[pyclass(flags(IMMUTABLETYPE), with(Callable, Constructor))]
 impl PyCArrayType {}
 
-#[pyclass(name = "Array", base = "PyCSimple", module = "_ctypes")]
+#[pyclass(
+    name = "Array",
+    base = "PyCData",
+    metaclass = "PyCArrayType",
+    module = "_ctypes"
+)]
 #[derive(PyPayload)]
 pub struct PyCArray {
     pub(super) typ: PyRwLock<PyTypeRef>,
