Skip to content

Implement property.__name__ attribute #6230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 3 commits into from
Nov 1, 2025
Merged

Implement property.__name__ attribute #6230

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0878b8e
Implement property.__name__ attribute
ever0de Oct 30, 2025
6bcb2b6
Refactor to use get_property_name in __name__ implementation
ever0de Oct 31, 2025
d04d121
style comment
ever0de Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor to use get_property_name in __name__ implementation 
Consolidate duplicate logic by making name_getter() use the existing
get_property_name() helper method. This eliminates code duplication
and improves maintainability.

Changes:
- Update get_property_name() to return PyResult<Option<PyObjectRef>>
  to properly handle and propagate non-AttributeError exceptions
- Simplify name_getter() to delegate to get_property_name()
- Update format_property_error() to handle the new return type

This addresses review feedback about the relationship between
get_property_name() and __name__ implementation.
  • Loading branch information
@ever0de
ever0de committed Oct 31, 2025
commit 6bcb2b63fc5c3609cc21765ebeed2c5fd99ecaa1
59 changes: 25 additions & 34 deletions vm/src/builtins/property.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,30 @@ impl GetDescriptor for PyProperty {
#[pyclass(with(Constructor, Initializer, GetDescriptor), flags(BASETYPE))]
impl PyProperty {
// Helper method to get property name
fn get_property_name(&self, vm: &VirtualMachine) -> Option<PyObjectRef> {
// Returns the name if available, None if not found, or propagates errors
fn get_property_name(&self, vm: &VirtualMachine) -> PyResult<Option<PyObjectRef>> {
// First check if name was set via __set_name__
if let Some(name) = self.name.read().as_ref() {
return Some(name.clone());
return Ok(Some(name.clone()));
}

// Otherwise try to get __name__ from getter
if let Some(getter) = self.getter.read().as_ref()
&& let Ok(name) = getter.get_attr("__name__", vm)
{
return Some(name);
if let Some(getter) = self.getter.read().as_ref() {
match getter.get_attr("__name__", vm) {
Ok(name) => Ok(Some(name)),
Err(e) => {
// If it's an AttributeError from the getter, return None
// Otherwise, propagate the original exception (e.g., RuntimeError)
if e.class().is(vm.ctx.exceptions.attribute_error) {
Ok(None)
} else {
Err(e)
}
}
}
} else {
Ok(None)
Copy link
Member

@youknowone youknowone Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if let Some(getter) = self.getter.read().as_ref() {
match getter.get_attr("__name__", vm) {
Ok(name) => Ok(Some(name)),
Err(e) => {
// If it's an AttributeError from the getter, return None
// Otherwise, propagate the original exception (e.g., RuntimeError)
if e.class().is(vm.ctx.exceptions.attribute_error) {
Ok(None)
} else {
Err(e)
}
}
}
} else {
Ok(None)
let Some(getter) = self.getter.read().as_ref() {
return Ok(None);
};
match getter.get_attr("__name__", vm) {
Ok(name) => Ok(Some(name)),
Err(e) => {
// If it's an AttributeError from the getter, return None
// Otherwise, propagate the original exception (e.g., RuntimeError)
if e.class().is(vm.ctx.exceptions.attribute_error) {
Ok(None)
} else {
Err(e)
}
}

}

None
}

// Descriptor methods
Expand Down Expand Up @@ -145,31 +155,12 @@ impl PyProperty {

#[pygetset(name = "__name__")]
fn name_getter(&self, vm: &VirtualMachine) -> PyResult {
// If name was explicitly set via __set_name__ or direct assignment
// (even to None), return it as-is
if let Some(name) = self.name.read().as_ref() {
return Ok(name.clone());
}

// Fallback to getter's __name__ if available
if let Some(getter) = self.getter.read().as_ref() {
match getter.get_attr("__name__", vm) {
Ok(name) => Ok(name),
Err(e) => {
// If it's an AttributeError from the getter, convert to property's AttributeError
// Otherwise, propagate the original exception (e.g., RuntimeError)
if e.class().is(vm.ctx.exceptions.attribute_error) {
return Err(vm.new_attribute_error(
"'property' object has no attribute '__name__'".to_owned(),
));
}

Err(e)
}
}
} else {
// If no getter, raise AttributeError
Err(vm.new_attribute_error("'property' object has no attribute '__name__'".to_owned()))
// Use get_property_name helper to get the name
match self.get_property_name(vm)? {
Some(name) => Ok(name),
None => Err(
vm.new_attribute_error("'property' object has no attribute '__name__'".to_owned())
),
}
}

Expand Down Expand Up @@ -323,7 +314,7 @@ impl PyProperty {
error_type: &str,
vm: &VirtualMachine,
) -> PyResult<String> {
let prop_name = self.get_property_name(vm);
let prop_name = self.get_property_name(vm)?;
let obj_type = obj.class();
let qualname = obj_type.__qualname__(vm);

Expand Down
Loading