PyPy: remove PyCode (PyCode_Type does not exist)

PyO3 · Mar 6, 2024 · 6c933ba · 6c933ba
1 parent 57bbc32
commit 6c933ba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/pyo3-ffi/src/cpython/code.rs b/pyo3-ffi/src/cpython/code.rs
@@ -230,6 +230,7 @@ pub const CO_FUTURE_GENERATOR_STOP: c_int = 0x8_0000;
 
 pub const CO_MAXBLOCKS: usize = 20;
 
+#[cfg(not(PyPy))]
 #[cfg_attr(windows, link(name = "pythonXY"))]
 extern "C" {
     pub static mut PyCode_Type: PyTypeObject;

diff --git a/src/types/code.rs b/src/types/code.rs
@@ -10,3 +10,17 @@ pyobject_native_type_core!(
     pyobject_native_static_type_object!(ffi::PyCode_Type),
     #checkfunction=ffi::PyCode_Check
 );
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::types::PyTypeMethods;
+    use crate::{PyTypeInfo, Python};
+
+    #[test]
+    fn test_type_object() {
+        Python::with_gil(|py| {
+            assert_eq!(PyCode::type_object_bound(py).name().unwrap(), "code");
+        })
+    }
+}
diff --git a/src/types/mod.rs b/src/types/mod.rs
@@ -5,7 +5,7 @@ pub use self::boolobject::{PyBool, PyBoolMethods};
 pub use self::bytearray::{PyByteArray, PyByteArrayMethods};
 pub use self::bytes::{PyBytes, PyBytesMethods};
 pub use self::capsule::{PyCapsule, PyCapsuleMethods};
-#[cfg(not(Py_LIMITED_API))]
+#[cfg(all(not(Py_LIMITED_API), not(PyPy)))]
 pub use self::code::PyCode;
 pub use self::complex::{PyComplex, PyComplexMethods};
 #[allow(deprecated)]
@@ -316,7 +316,7 @@ pub(crate) mod boolobject;
 pub(crate) mod bytearray;
 pub(crate) mod bytes;
 pub(crate) mod capsule;
-#[cfg(not(Py_LIMITED_API))]
+#[cfg(all(not(Py_LIMITED_API), not(PyPy)))]
 mod code;
 pub(crate) mod complex;
 #[cfg(not(Py_LIMITED_API))]