Move 7.3.8 warning over to make_module

PyO3 · Apr 13, 2022 · 97230d1 · 97230d1
1 parent bf3d7a0
commit 97230d1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/src/callback.rs b/src/callback.rs
@@ -244,23 +244,6 @@ where
     let unwind_safe_py = AssertUnwindSafe(pool.python());
     let panic_result = panic::catch_unwind(move || -> PyResult<_> {
         let py = *unwind_safe_py;
-        #[cfg(all(PyPy, not(Py_3_8)))]
-        {
-            const PYPY_GOOD_VERSION: [u8; 3] = [7, 3, 8];
-            let version = py
-                .import("sys")?
-                .getattr("implementation")?
-                .getattr("version")?;
-            if version.compare(crate::types::PyTuple::new(py, &PYPY_GOOD_VERSION))?
-                == std::cmp::Ordering::Less
-            {
-                let warn = py.import("warnings")?.getattr("warn")?;
-                warn.call1((
-                    "PyPy 3.7 versions older than 7.3.8 are known to have binary \
-                             compatibility issues which may cause segfaults. Please upgrade.",
-                ))?;
-            }
-        }
         body(py)
     });
 

diff --git a/src/derive_utils.rs b/src/derive_utils.rs
@@ -319,6 +319,24 @@ impl ModuleDef {
         py: Python,
         initializer: impl Fn(Python, &PyModule) -> PyResult<()>,
     ) -> PyResult<*mut ffi::PyObject> {
+        #[cfg(all(PyPy, not(Py_3_8)))]
+        {
+            const PYPY_GOOD_VERSION: [u8; 3] = [7, 3, 8];
+            let version = py
+                .import("sys")?
+                .getattr("implementation")?
+                .getattr("version")?;
+            if version.compare(crate::types::PyTuple::new(py, &PYPY_GOOD_VERSION))?
+                == std::cmp::Ordering::Less
+            {
+                let warn = py.import("warnings")?.getattr("warn")?;
+                warn.call1((
+                    "PyPy 3.7 versions older than 7.3.8 are known to have binary \
+                             compatibility issues which may cause segfaults. Please upgrade.",
+                ))?;
+            }
+        }
+
         let module =
             unsafe { py.from_owned_ptr_or_err::<PyModule>(ffi::PyModule_Create(self.0.get()))? };
         initializer(py, module)?;