Implement getattr_opt on PyAnyMethods #4978
Conversation
src/types/any.rs
Outdated
| // When ptr is NULL, the attribute does not exist | ||
| true => Ok(None), |
There was a problem hiding this comment.
This looks wrong; if the return value is null then an exception is raised.
I think probably better to make the non-3.13 branch just call self.getattr(attr_name) and then check for AttributeError (and return None in that case).
There was a problem hiding this comment.
Indeed. Passing it to self.getattr is much cleaner and logically correct. I've revised it. Thanks
src/types/any.rs
Outdated
| /// This is equivalent to the Python expression `getattr(self, attr_name, None)`, but uses | ||
| /// the Python 3.13+ `PyObject_GetOptionalAttr` API for efficiency. Unlike `getattr`, it | ||
| /// returns `None` if the attribute is not found instead of raising `AttributeError`. |
There was a problem hiding this comment.
I would be downplay the efficiency gain, as many classes implementing __getattr__ will necessarily still be raising AttributeError which the API is swallowing internally.
| /// This is equivalent to the Python expression `getattr(self, attr_name, None)`, but uses | |
| /// the Python 3.13+ `PyObject_GetOptionalAttr` API for efficiency. Unlike `getattr`, it | |
| /// returns `None` if the attribute is not found instead of raising `AttributeError`. | |
| /// This is equivalent to the Python expression `getattr(self, attr_name, None)`, which may | |
| /// be more efficient in some cases by simply returning `None` if the attribute is not found | |
| /// instead of raising `AttributeError`. |
There was a problem hiding this comment.
Thanks & adopted your suggestions.
| @@ -1656,6 +1737,86 @@ class NonHeapNonDescriptorInt: | |||
| }) | |||
| } | |||
|
|
|||
| #[test] | |||
| fn test_getattr_opt() { | |||
There was a problem hiding this comment.
This test seems possibly more complicated than it needs to be. IMO we only need to test three cases:
- try to get an attribute which exists
- try to get an attribute which doesn't exist
- try to get an attribute from a property, which raises
ValueError
There was a problem hiding this comment.
Indeed - I've revised the unit test to test only the above 3 cases. Thanks!
Fix #4842
This PR implements
getattr_optas proposed in the issue using the FFI PyObject_GetOptionalAttr added in Python 3.13, and includes supports for older C API versions.