Skip to content

Fix property.__set_name__ error message when arguments are invalid #4165

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
Feb 23, 2023
Merged

Fix property.__set_name__ error message when arguments are invalid #4165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4aa062
Fix `set_name` error message when arguments are invalid
jopemachine Sep 16, 2022
e967e5e
Add `SetNameArgs`
jopemachine Sep 17, 2022
e325a00
Revert "Add `SetNameArgs`"
jopemachine Sep 18, 2022
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
2 changes: 0 additions & 2 deletions Lib/test/test_property.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ def __doc__(cls):
return 'Second'
self.assertEqual(A.__doc__, 'Second')

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_property_set_name_incorrect_args(self):
p = property()

Expand Down
18 changes: 18 additions & 0 deletions vm/src/builtins/property.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
use super::{PyType, PyTypeRef};
use crate::common::lock::PyRwLock;
use crate::function::PosArgs;
use crate::{
class::PyClassImpl,
function::{FuncArgs, PySetterValue},
Expand Down Expand Up @@ -122,6 +123,23 @@ impl PyProperty {
*self.doc.write() = value;
}

#[pymethod(magic)]
fn set_name(&self, args: PosArgs, vm: &VirtualMachine) -> PyResult<()> {
let arg_len = args.into_vec().len();

if arg_len != 2 {
Err(vm.new_exception_msg(
vm.ctx.exceptions.type_error.to_owned(),
format!(
"__set_name__() takes 2 positional arguments but {} were given",
arg_len
),
Comment on lines +133 to +136

@youknowone youknowone Sep 19, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This message is common python type error which we are not handling well. We'd better to find enhance the general argument error handling instead of this way.

@youknowone youknowone Oct 2, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I am sorry, the given type is PosArgs. So no way to do it in shared code.

))
} else {
Ok(())
}
}

// Python builder functions

#[pymethod]
Expand Down