Support cfg with module members

Author: Tpt

.github/workflows/ci.yml

@@ -788,6 +788,7 @@ jobs:
           components: rust-src
       - uses: actions/setup-python@v5
         with:
+          python-version: "3.12"
           architecture: ${{ matrix.platform.python-architecture }}
       - uses: Swatinem/rust-cache@v2
         with:

pyo3-introspection/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1"
-goblin = "0.8.0"
+goblin = "0.9.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 

pyo3-macros-backend/src/introspection.rs

@@ -13,14 +13,15 @@ use std::collections::HashMap;
 use std::hash::{Hash, Hasher};
 use std::mem::take;
 use std::sync::atomic::{AtomicUsize, Ordering};
-use syn::Ident;
+use syn::{Attribute, Ident};
 
 static GLOBAL_COUNTER_FOR_UNIQUE_NAMES: AtomicUsize = AtomicUsize::new(0);
 
 pub fn module_introspection_code<'a>(
     pyo3_crate_path: &PyO3CratePath,
     name: &str,
     members: impl IntoIterator<Item = &'a Ident>,
+    members_cfg_attrs: impl IntoIterator<Item = &'a Vec<Attribute>>,
 ) -> TokenStream {
     let stub = IntrospectionNode::Map(
         [
@@ -32,7 +33,14 @@ pub fn module_introspection_code<'a>(
                 IntrospectionNode::List(
                     members
                         .into_iter()
-                        .map(|member| IntrospectionNode::IntrospectionId(Some(member)))
+                        .zip(members_cfg_attrs)
+                        .filter_map(|(member, attributes)| {
+                            if attributes.is_empty() {
+                                Some(IntrospectionNode::IntrospectionId(Some(member)))
+                            } else {
+                                None // TODO: properly interpret cfg attributes
+                            }
+                        })
                         .collect(),
                 ),
             ),

pyo3-macros-backend/src/module.rs

@@ -340,7 +340,12 @@ pub fn pymodule_module_impl(
     }
 
     #[cfg(feature = "experimental-inspect")]
-    let introspection = module_introspection_code(pyo3_path, &name.to_string(), &module_items);
+    let introspection = module_introspection_code(
+        pyo3_path,
+        &name.to_string(),
+        &module_items,
+        &module_items_cfg_attrs,
+    );
     #[cfg(not(feature = "experimental-inspect"))]
     let introspection = quote! {};
 
@@ -410,7 +415,7 @@ pub fn pymodule_function_impl(
     );
 
     #[cfg(feature = "experimental-inspect")]
-    let introspection = module_introspection_code(pyo3_path, &name.to_string(), &[]);
+    let introspection = module_introspection_code(pyo3_path, &name.to_string(), &[], &[]);
     #[cfg(not(feature = "experimental-inspect"))]
     let introspection = quote! {};
 

pytests/stubs/pyclasses.pyi

@@ -1,4 +1,3 @@
-class ClassWithDict: ...
 class AssertingBaseClass: ...
 class ClassWithoutConstructor: ...
 class EmptyClass: ...

tests/test_compile_error.rs

@@ -58,7 +58,7 @@ fn test_compile_errors() {
     #[cfg(any(not(Py_LIMITED_API), Py_3_10))] // to avoid PyFunctionArgument for &str
     t.compile_fail("tests/ui/invalid_cancel_handle.rs");
     t.pass("tests/ui/pymodule_missing_docs.rs");
-    #[cfg(not(Py_LIMITED_API))]
+    #[cfg(not(any(Py_LIMITED_API, feature = "experimental-inspect")))]
     t.pass("tests/ui/forbid_unsafe.rs");
     #[cfg(all(Py_LIMITED_API, not(feature = "experimental-async")))]
     // output changes with async feature