sync import.rs FFI definitions with Python 3.14 (#5737)

* sync import.rs FFI definitions with Python 3.14

* newsfragments

* fix imports on PyPy

Author: davidhewitt

newsfragments/5737.added.md

@@ -0,0 +1 @@
+Add FFI definitions `PyImport_ImportModuleAttr` and `PyImport_ImportModuleAttrString` on Python 3.14+.

newsfragments/5737.changed.md

@@ -0,0 +1 @@
+Deprecate FFI definition `PyImport_ImportModuleNoBlock` (deprecated in Python 3.13).

newsfragments/5737.fixed.md

@@ -0,0 +1 @@
+Fix FFI definition `PyImport_GetModule` on PyPy.

newsfragments/5737.removed.md

@@ -0,0 +1 @@
+Remove private FFI definitions `_PyImport_IsInitialized`, `_PyImport_SetModule`, `_PyImport_SetModuleString`, `_PyImport_AcquireLock`, `_PyImport_ReleaseLock`, `_PyImport_FindBuiltin`, `_PyImport_FindExtensionObject`, `_PyImport_FixupBuiltin`, and `_PyImport_FixupExtensionObject`.

pyo3-ffi/src/cpython/import.rs

@@ -1,33 +1,9 @@
-use crate::{PyInterpreterState, PyObject};
+#[cfg(any(not(PyPy), Py_3_14))]
+use crate::PyObject;
+#[cfg(any(not(PyPy), Py_3_14))]
+use std::ffi::c_char;
 #[cfg(not(PyPy))]
-use std::ffi::c_uchar;
-use std::ffi::{c_char, c_int};
-
-// skipped PyInit__imp
-
-extern "C" {
-    pub fn _PyImport_IsInitialized(state: *mut PyInterpreterState) -> c_int;
-    // skipped _PyImport_GetModuleId
-    pub fn _PyImport_SetModule(name: *mut PyObject, module: *mut PyObject) -> c_int;
-    pub fn _PyImport_SetModuleString(name: *const c_char, module: *mut PyObject) -> c_int;
-    pub fn _PyImport_AcquireLock();
-    pub fn _PyImport_ReleaseLock() -> c_int;
-    #[cfg(not(Py_3_9))]
-    pub fn _PyImport_FindBuiltin(name: *const c_char, modules: *mut PyObject) -> *mut PyObject;
-    #[cfg(not(Py_3_11))]
-    pub fn _PyImport_FindExtensionObject(a: *mut PyObject, b: *mut PyObject) -> *mut PyObject;
-    pub fn _PyImport_FixupBuiltin(
-        module: *mut PyObject,
-        name: *const c_char,
-        modules: *mut PyObject,
-    ) -> c_int;
-    pub fn _PyImport_FixupExtensionObject(
-        a: *mut PyObject,
-        b: *mut PyObject,
-        c: *mut PyObject,
-        d: *mut PyObject,
-    ) -> c_int;
-}
+use std::ffi::{c_int, c_uchar};
 
 #[cfg(not(PyPy))]
 #[repr(C)]
@@ -41,9 +17,7 @@ pub struct _inittab {
 extern "C" {
     #[cfg(not(PyPy))]
     pub static mut PyImport_Inittab: *mut _inittab;
-}
 
-extern "C" {
     #[cfg(not(PyPy))]
     pub fn PyImport_ExtendInittab(newtab: *mut _inittab) -> c_int;
 }
@@ -65,8 +39,15 @@ pub struct _frozen {
 extern "C" {
     #[cfg(not(PyPy))]
     pub static mut PyImport_FrozenModules: *const _frozen;
-}
 
-// skipped _PyImport_FrozenBootstrap
-// skipped _PyImport_FrozenStdlib
-// skipped _PyImport_FrozenTest
+    #[cfg(Py_3_14)]
+    pub fn PyImport_ImportModuleAttr(
+        mod_name: *mut PyObject,
+        attr_name: *mut PyObject,
+    ) -> *mut PyObject;
+    #[cfg(Py_3_14)]
+    pub fn PyImport_ImportModuleAttrString(
+        mod_name: *const c_char,
+        attr_name: *const c_char,
+    ) -> *mut PyObject;
+}

pyo3-ffi/src/cpython/mod.rs

@@ -15,6 +15,7 @@ pub(crate) mod dictobject;
 pub(crate) mod frameobject;
 pub(crate) mod funcobject;
 pub(crate) mod genobject;
+#[cfg(any(not(PyPy), Py_3_14))]
 pub(crate) mod import;
 #[cfg(all(Py_3_8, not(PyPy)))]
 pub(crate) mod initconfig;
@@ -57,6 +58,7 @@ pub use self::floatobject::*;
 pub use self::frameobject::*;
 pub use self::funcobject::*;
 pub use self::genobject::*;
+#[cfg(any(not(PyPy), Py_3_14))]
 pub use self::import::*;
 #[cfg(all(Py_3_8, not(PyPy)))]
 pub use self::initconfig::*;

pyo3-ffi/src/import.rs

@@ -26,7 +26,8 @@ extern "C" {
     ) -> *mut PyObject;
     #[cfg_attr(PyPy, link_name = "PyPyImport_GetModuleDict")]
     pub fn PyImport_GetModuleDict() -> *mut PyObject;
-    // skipped Python 3.7 / ex-non-limited PyImport_GetModule
+    #[cfg_attr(PyPy, link_name = "PyPyImport_GetModule")]
+    pub fn PyImport_GetModule(name: *mut PyObject) -> *mut PyObject;
     pub fn PyImport_AddModuleObject(name: *mut PyObject) -> *mut PyObject;
     #[cfg_attr(PyPy, link_name = "PyPyImport_AddModule")]
     pub fn PyImport_AddModule(name: *const c_char) -> *mut PyObject;
@@ -35,6 +36,7 @@ extern "C" {
     pub fn PyImport_AddModuleRef(name: *const c_char) -> *mut PyObject;
     #[cfg_attr(PyPy, link_name = "PyPyImport_ImportModule")]
     pub fn PyImport_ImportModule(name: *const c_char) -> *mut PyObject;
+    #[deprecated(note = "Python 3.13")]
     #[cfg_attr(PyPy, link_name = "PyPyImport_ImportModuleNoBlock")]
     pub fn PyImport_ImportModuleNoBlock(name: *const c_char) -> *mut PyObject;
     #[cfg_attr(PyPy, link_name = "PyPyImport_ImportModuleLevel")]