fix complex enum __qualname__ not using python name (#5815)

Author: Icxolu

newsfragments/5815.fixed.md

@@ -0,0 +1 @@
+fix complex enum `__qualname__` not using python name

pyo3-macros-backend/src/pyclass.rs

@@ -823,12 +823,32 @@ struct PyClassEnumStructVariant<'a> {
     options: EnumVariantPyO3Options,
 }
 
+impl PyClassEnumStructVariant<'_> {
+    fn python_name(&self) -> Cow<'_, syn::Ident> {
+        self.options
+            .name
+            .as_ref()
+            .map(|name_attr| Cow::Borrowed(&name_attr.value.0))
+            .unwrap_or_else(|| Cow::Owned(self.ident.unraw()))
+    }
+}
+
 struct PyClassEnumTupleVariant<'a> {
     ident: &'a syn::Ident,
     fields: Vec<PyClassEnumVariantUnnamedField<'a>>,
     options: EnumVariantPyO3Options,
 }
 
+impl PyClassEnumTupleVariant<'_> {
+    fn python_name(&self) -> Cow<'_, syn::Ident> {
+        self.options
+            .name
+            .as_ref()
+            .map(|name_attr| Cow::Borrowed(&name_attr.value.0))
+            .unwrap_or_else(|| Cow::Owned(self.ident.unraw()))
+    }
+}
+
 struct PyClassEnumVariantNamedField<'a> {
     ident: &'a syn::Ident,
     ty: &'a syn::Type,
@@ -1288,7 +1308,7 @@ fn impl_complex_enum(
         variant_cls_pytypeinfos.push(variant_cls_pytypeinfo);
 
         let (variant_cls_impl, field_getters, mut slots) =
-            impl_complex_enum_variant_cls(cls, &variant, ctx)?;
+            impl_complex_enum_variant_cls(cls, &args, &variant, ctx)?;
         variant_cls_impls.push(variant_cls_impl);
 
         let variant_new = complex_enum_variant_new(cls, variant, ctx)?;
@@ -1341,15 +1361,16 @@ fn impl_complex_enum(
 
 fn impl_complex_enum_variant_cls(
     enum_name: &syn::Ident,
+    args: &PyClassArgs,
     variant: &PyClassEnumVariant<'_>,
     ctx: &Ctx,
 ) -> Result<(TokenStream, Vec<MethodAndMethodDef>, Vec<MethodAndSlotDef>)> {
     match variant {
         PyClassEnumVariant::Struct(struct_variant) => {
-            impl_complex_enum_struct_variant_cls(enum_name, struct_variant, ctx)
+            impl_complex_enum_struct_variant_cls(enum_name, args, struct_variant, ctx)
         }
         PyClassEnumVariant::Tuple(tuple_variant) => {
-            impl_complex_enum_tuple_variant_cls(enum_name, tuple_variant, ctx)
+            impl_complex_enum_tuple_variant_cls(enum_name, args, tuple_variant, ctx)
         }
     }
 }
@@ -1406,6 +1427,7 @@ fn impl_complex_enum_variant_match_args(
 
 fn impl_complex_enum_struct_variant_cls(
     enum_name: &syn::Ident,
+    args: &PyClassArgs,
     variant: &PyClassEnumStructVariant<'_>,
     ctx: &Ctx,
 ) -> Result<(TokenStream, Vec<MethodAndMethodDef>, Vec<MethodAndSlotDef>)> {
@@ -1452,8 +1474,12 @@ fn impl_complex_enum_struct_variant_cls(
         field_getter_impls.push(field_getter_impl);
     }
 
-    let (qualname, qualname_impl) =
-        impl_complex_enum_variant_qualname(enum_name, variant_ident, &variant_cls_type, ctx)?;
+    let (qualname, qualname_impl) = impl_complex_enum_variant_qualname(
+        &get_class_python_name(enum_name, args),
+        &variant.python_name(),
+        &variant_cls_type,
+        ctx,
+    )?;
 
     field_getters.push(qualname);
 
@@ -1624,6 +1650,7 @@ fn impl_complex_enum_tuple_variant_getitem(
 
 fn impl_complex_enum_tuple_variant_cls(
     enum_name: &syn::Ident,
+    args: &PyClassArgs,
     variant: &PyClassEnumTupleVariant<'_>,
     ctx: &Ctx,
 ) -> Result<(TokenStream, Vec<MethodAndMethodDef>, Vec<MethodAndSlotDef>)> {
@@ -1648,8 +1675,12 @@ fn impl_complex_enum_tuple_variant_cls(
         &mut field_types,
     )?;
 
-    let (qualname, qualname_impl) =
-        impl_complex_enum_variant_qualname(enum_name, variant_ident, &variant_cls_type, ctx)?;
+    let (qualname, qualname_impl) = impl_complex_enum_variant_qualname(
+        &get_class_python_name(enum_name, args),
+        &variant.python_name(),
+        &variant_cls_type,
+        ctx,
+    )?;
 
     field_getters.push(qualname);
 

tests/test_enum.rs

@@ -419,3 +419,21 @@ fn complex_enum_variant_qualname() {
         py_assert!(py, cls, "cls.B.__qualname__ == 'ComplexEnum.B'");
     });
 }
+
+#[test]
+fn complex_enum_renamed_variant_qualname() {
+    #[pyclass(name = "ComplexEnum", skip_from_py_object)]
+    pub enum PyComplexEnum {
+        #[pyo3(name = "A")]
+        PyA(i32),
+        B {
+            msg: String,
+        },
+    }
+
+    Python::attach(|py| {
+        let cls = py.get_type::<PyComplexEnum>();
+        py_assert!(py, cls, "cls.A.__qualname__ == 'ComplexEnum.A'");
+        py_assert!(py, cls, "cls.B.__qualname__ == 'ComplexEnum.B'");
+    });
+}