Renames #[pyo3] to #[pymodule_export]

PyO3 · Feb 21, 2024 · 78fd5be · 78fd5be
1 parent 3796ffb
commit 78fd5be
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/pyo3-macros-backend/src/module.rs b/pyo3-macros-backend/src/module.rs
@@ -116,7 +116,7 @@ pub fn pymodule_module_impl(mut module: syn::ItemMod) -> Result<TokenStream> {
             Item::Use(item_use) => {
                 let mut is_pyo3 = false;
                 item_use.attrs.retain(|attr| {
-                    let found = attr.path().is_ident("pyo3");
+                    let found = attr.path().is_ident("pymodule_export");
                     is_pyo3 |= found;
                     !found
                 });

diff --git a/pytests/src/lib.rs b/pytests/src/lib.rs
@@ -1,4 +1,5 @@
 use pyo3::prelude::*;
+
 pub mod awaitable;
 pub mod buf_and_str;
 pub mod comparisons;
@@ -18,14 +19,14 @@ pub mod subclassing;
 mod pyo3_pytests {
     use super::*;
     use pyo3::types::PyDict;
-    #[pyo3]
+    #[pymodule_export]
     use {
         awaitable::awaitable, comparisons::comparisons, dict_iter::dict_iter, enums::enums,
         misc::misc, objstore::objstore, othermod::othermod, path::path, pyclasses::pyclasses,
         pyfunctions::pyfunctions, sequence::sequence, subclassing::subclassing,
     };
     #[cfg(not(Py_LIMITED_API))]
-    #[pyo3]
+    #[pymodule_export]
     use {buf_and_str::buf_and_str, datetime::datetime};
 
     #[pymodule_init]

diff --git a/tests/test_append_to_inittab.rs b/tests/test_append_to_inittab.rs
@@ -1,4 +1,5 @@
 #![cfg(all(feature = "macros", not(PyPy)))]
+
 use pyo3::prelude::*;
 
 #[pyfunction]
@@ -14,7 +15,7 @@ fn module_fn_with_functions(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
 
 #[pymodule]
 mod module_mod_with_functions {
-    #[pyo3]
+    #[pymodule_export]
     use super::foo;
 }
 

diff --git a/tests/test_module.rs b/tests/test_module.rs
@@ -496,14 +496,14 @@ create_exception!(
 /// A module written using declarative syntax.
 #[pymodule]
 mod declarative_module {
-    #[pyo3]
+    #[pymodule_export]
     use super::declarative_submodule;
-    #[pyo3]
+    #[pymodule_export]
     // This is not a real constraint but to test cfg attribute support
     #[cfg(not(Py_LIMITED_API))]
     use super::LocatedClass;
     use super::*;
-    #[pyo3]
+    #[pymodule_export]
     use super::{declarative_module2, double, MyError, ValueClass as Value};
 
     #[pymodule_init]
@@ -519,15 +519,15 @@ fn double_value(v: &ValueClass) -> usize {
 
 #[pymodule]
 mod declarative_submodule {
-    #[pyo3]
+    #[pymodule_export]
     use super::{double, double_value};
 }
 
 /// A module written using declarative syntax.
 #[pymodule]
 #[pyo3(name = "declarative_module_renamed")]
 mod declarative_module2 {
-    #[pyo3]
+    #[pymodule_export]
     use super::double;
 }
 

diff --git a/tests/ui/invalid_pymodule_glob.rs b/tests/ui/invalid_pymodule_glob.rs
@@ -7,7 +7,7 @@ fn foo() -> usize {
 
 #[pymodule]
 mod module {
-    #[pyo3]
+    #[pymodule_export]
     use super::*;
 }
 

diff --git a/tests/ui/invalid_pymodule_in_root_module.rs b/tests/ui/invalid_pymodule_in_root_module.rs
diff --git a/tests/ui/invalid_pymodule_trait.rs b/tests/ui/invalid_pymodule_trait.rs
@@ -2,7 +2,7 @@ use pyo3::prelude::*;
 
 #[pymodule]
 mod module {
-    #[pyo3]
+    #[pymodule_export]
     trait Foo {}
 }
 

diff --git a/tests/ui/invalid_pymodule_trait.stderr b/tests/ui/invalid_pymodule_trait.stderr
@@ -1,5 +1,5 @@
 error: only 'use' statements and and pymodule_init functions are allowed in #[pymodule]
  --> tests/ui/invalid_pymodule_trait.rs:5:5
   |
-5 |     #[pyo3]
+5 |     #[pymodule_export]
   |     ^