Skip to content

Avoid using PyDictObject when compiling for RustPython #6057

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

Open
bschoenmaeckers wants to merge 3 commits into
base: main
Choose a base branch
from
+24 −6
Open

Avoid using PyDictObject when compiling for RustPython #6057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
264bba6
Avoid using `PyDictObject` when compiling for RustPython
bschoenmaeckers May 18, 2026
fef3a8c
Always disable cpython ffi functions when compiling for RustPython
bschoenmaeckers May 26, 2026
55c2ea9
Force enable `Py_LIMITED_API` when compiling for `RustPython`
bschoenmaeckers May 26, 2026
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
23 changes: 21 additions & 2 deletions pyo3-build-config/src/impl_.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,11 @@ impl InterpreterConfig {
PythonImplementation::RustPython => out.push("cargo:rustc-cfg=RustPython".to_owned()),
}

// If Py_GIL_DISABLED is set, do not build with limited API support
if self.abi3 && !self.is_free_threaded() {
// RustPython always builds with limited API support.
// If Py_GIL_DISABLED is set, do not build with limited API support.
if (self.abi3 && !self.is_free_threaded())
|| self.implementation == PythonImplementation::RustPython
{
out.push("cargo:rustc-cfg=Py_LIMITED_API".to_owned());
}

Expand Down Expand Up @@ -3188,6 +3191,22 @@ mod tests {
"cargo:rustc-cfg=PyPy".to_owned(),
]
);

let interpreter_config =
InterpreterConfigBuilder::new(PythonImplementation::RustPython, version)
.finalize()
.unwrap();
assert_eq!(
interpreter_config.build_script_outputs(),
[
"cargo:rustc-cfg=Py_3_8".to_owned(),
"cargo:rustc-cfg=Py_3_9".to_owned(),
"cargo:rustc-cfg=Py_3_10".to_owned(),
"cargo:rustc-cfg=Py_3_11".to_owned(),
"cargo:rustc-cfg=RustPython".to_owned(),
"cargo:rustc-cfg=Py_LIMITED_API".to_owned(),
]
);
}

#[test]
Expand Down
4 changes: 2 additions & 2 deletions pyo3-ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,8 +600,8 @@ mod weakrefobject;
pub mod structmember;

// "Limited API" definitions matching Python's `include/cpython` directory.
#[cfg(not(Py_LIMITED_API))]
#[cfg(not(any(Py_LIMITED_API, RustPython)))]
mod cpython;

#[cfg(not(Py_LIMITED_API))]
#[cfg(not(any(Py_LIMITED_API, RustPython)))]
pub use self::cpython::*;
3 changes: 1 addition & 2 deletions src/types/dict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ pyobject_native_type!(
);

#[cfg(RustPython)]
pyobject_native_type!(
pyobject_native_type_core!(
PyDict,
ffi::PyDictObject,
|py| {
static TYPE: PyOnceLock<Py<PyType>> = PyOnceLock::new();
TYPE.import(py, "builtins", "dict").unwrap().as_type_ptr()
Expand Down