Skip to content

Fix _ctypes.Array base and metaclass #5620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 4 commits into from
Mar 27, 2025
Merged

Fix _ctypes.Array base and metaclass #5620

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b27cf5
Rename ctypes test file
youknowone Mar 25, 2025
279bdf1
Fix _ctypes.Array base and metaclass
youknowone Mar 25, 2025
7f13a1f
Rename PyCSimpleType
youknowone Mar 25, 2025
74f6cc0
_ctypes.{Structure,Union} base type
youknowone Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename PyCSimpleType
  • Loading branch information
@youknowone
youknowone committed Mar 25, 2025
commit 7f13a1f38a25a575368c4dd5e2199a740200eb18
4 changes: 2 additions & 2 deletions vm/src/stdlib/ctypes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ pub(crate) mod union;

use crate::builtins::PyModule;
use crate::class::PyClassImpl;
use crate::stdlib::ctypes::base::{PyCData, PyCSimple, PySimpleMeta};
use crate::stdlib::ctypes::base::{PyCData, PyCSimple, PyCSimpleType};
use crate::{Py, PyRef, VirtualMachine};

pub fn extend_module_nodes(vm: &VirtualMachine, module: &Py<PyModule>) {
let ctx = &vm.ctx;
PySimpleMeta::make_class(ctx);
PyCSimpleType::make_class(ctx);
array::PyCArrayType::make_class(ctx);
extend_module!(vm, module, {
"_CData" => PyCData::make_class(ctx),
Expand Down
8 changes: 4 additions & 4 deletions vm/src/stdlib/ctypes/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,10 @@ pub struct PyCData {
impl PyCData {}

#[pyclass(module = "_ctypes", name = "PyCSimpleType", base = "PyType")]
pub struct PySimpleMeta {}
pub struct PyCSimpleType {}

#[pyclass(flags(BASETYPE))]
impl PySimpleMeta {
impl PyCSimpleType {
#[allow(clippy::new_ret_no_self)]
#[pymethod]
fn new(cls: PyTypeRef, _: OptionalArg, vm: &VirtualMachine) -> PyResult {
Expand All @@ -176,10 +176,10 @@ impl PySimpleMeta {
}

#[pyclass(
module = "_ctypes",
name = "_SimpleCData",
base = "PyCData",
module = "_ctypes",
metaclass = "PySimpleMeta"
metaclass = "PyCSimpleType"
)]
#[derive(PyPayload)]
pub struct PyCSimple {
Expand Down