@@ -74,22 +74,22 @@ impl PyProperty {
7474 return Ok ( Some ( name. clone ( ) ) ) ;
7575 }
7676
77- // Otherwise try to get __name__ from getter
78- if let Some ( getter) = self . getter . read ( ) . as_ref ( ) {
79- match getter. get_attr ( "__name__" , vm) {
80- Ok ( name) => Ok ( Some ( name) ) ,
81- Err ( e) => {
82- // If it's an AttributeError from the getter, return None
83- // Otherwise, propagate the original exception (e.g., RuntimeError)
84- if e. class ( ) . is ( vm. ctx . exceptions . attribute_error ) {
85- Ok ( None )
86- } else {
87- Err ( e)
88- }
77+ let getter = self . getter . read ( ) ;
78+ let Some ( getter) = getter. as_ref ( ) else {
79+ return Ok ( None ) ;
80+ } ;
81+
82+ match getter. get_attr ( "__name__" , vm) {
83+ Ok ( name) => Ok ( Some ( name) ) ,
84+ Err ( e) => {
85+ // If it's an AttributeError from the getter, return None
86+ // Otherwise, propagate the original exception (e.g., RuntimeError)
87+ if e. class ( ) . is ( vm. ctx . exceptions . attribute_error ) {
88+ Ok ( None )
89+ } else {
90+ Err ( e)
8991 }
9092 }
91- } else {
92- Ok ( None )
9393 }
9494 }
9595
@@ -155,7 +155,6 @@ impl PyProperty {
155155
156156 #[ pygetset( name = "__name__" ) ]
157157 fn name_getter ( & self , vm : & VirtualMachine ) -> PyResult {
158- // Use get_property_name helper to get the name
159158 match self . get_property_name ( vm) ? {
160159 Some ( name) => Ok ( name) ,
161160 None => Err (
0 commit comments