Skip to content

Update PyMemberDescrObject struct to match CPython #5647

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
davidhewitt merged 4 commits into from
Nov 26, 2025
+7 −0
Merged

Update PyMemberDescrObject struct to match CPython #5647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96294a1
Update PyMemberDescrObject.d_member type
SilasMarvin Nov 23, 2025
ddbe5b2
Set for correct python versions
SilasMarvin Nov 25, 2025
2b7035e
Appease clippy and add news fragment
SilasMarvin Nov 25, 2025
b066d63
Add conditional use
SilasMarvin Nov 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
1 change: 1 addition & 0 deletions newsfragments/5647.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix `PyMemberDescrObject.d_member` type in `pyo3-ffi` to use `PyMemberDef` for Python 3.11+ (was incorrectly `PyGetSetDef`).
6 changes: 6 additions & 0 deletions pyo3-ffi/src/cpython/descrobject.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
use crate::{PyGetSetDef, PyMethodDef, PyObject, PyTypeObject};
use std::ffi::{c_char, c_int, c_void};

#[cfg(Py_3_11)]
use crate::PyMemberDef;

pub type wrapperfunc = Option<
unsafe extern "C" fn(
slf: *mut PyObject,
Expand Down Expand Up @@ -53,7 +56,10 @@ pub struct PyMethodDescrObject {
#[repr(C)]
pub struct PyMemberDescrObject {
pub d_common: PyDescrObject,
#[cfg(not(Py_3_11))]
pub d_member: *mut PyGetSetDef,
#[cfg(Py_3_11)]
pub d_member: *mut PyMemberDef,
}

#[repr(C)]
Expand Down
Loading