Skip to content

Fix decorators #3783

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 13 commits into from
Jul 16, 2022
Merged

Fix decorators #3783

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e5bf112
Implement __func__ in @staticmethod
ChJR Jun 11, 2022
c3d1417
Add descriptors to @classmethod and @staticmethod
ChJR Jun 12, 2022
4c97056
Fix __doc__ attribute
ChJR Jun 12, 2022
ced6b68
Fix string representations of @classmethod and @staticmethod
ChJR Jun 12, 2022
d6e71ad
Fix __get__ in @classmethod
ChJR Jun 12, 2022
b6df0ce
Enable decorator tests
ChJR Jun 12, 2022
728582f
Fix codes with Clippy
ChJR Jun 12, 2022
f2e62cf
Fix other affected tests
ChJR Jun 13, 2022
9dd999c
Improve code quality
ChJR Jul 10, 2022
9d9f9d3
Change the variable name better format
ChJR Jul 15, 2022
4bf5644
Improve code quality
ChJR Jul 16, 2022
fccb4d6
Simplify __doc__ initializing
ChJR Jul 16, 2022
8ef21ee
Apply PEP 614
ChJR Jul 16, 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
Prev Previous commit
Next Next commit
Add descriptors to @classmethod and @staticmethod
  • Loading branch information
@ChJR
ChJR committed Jun 21, 2022
commit c3d14171efab66d8200ddae9faca17f6573caa98
30 changes: 30 additions & 0 deletions vm/src/builtins/classmethod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,36 @@ impl PyClassMethod {
self.callable.lock().clone()
}

#[pyproperty(magic)]
fn wrapped(&self) -> PyObjectRef {
self.callable.clone()
}

#[pyproperty(magic)]
fn module(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__module__", vm)
}

#[pyproperty(magic)]
fn qualname(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__qualname__", vm)
}

#[pyproperty(magic)]
fn name(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__name__", vm)
}

#[pyproperty(magic)]
fn annotations(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__annotations__", vm)
}

#[pyproperty(magic)]
fn doc(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__doc__", vm)
}

#[pyproperty(magic)]
fn isabstractmethod(&self, vm: &VirtualMachine) -> PyObjectRef {
match vm.get_attribute_opt(self.callable.lock().clone(), "__isabstractmethod__") {
Expand Down
30 changes: 30 additions & 0 deletions vm/src/builtins/staticmethod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,36 @@ impl PyStaticMethod {
self.callable.clone()
}

#[pyproperty(magic)]
fn wrapped(&self) -> PyObjectRef {
self.callable.clone()
}

#[pyproperty(magic)]
fn module(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__module__", vm)
}

#[pyproperty(magic)]
fn qualname(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__qualname__", vm)
}

#[pyproperty(magic)]
fn name(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__name__", vm)
}

#[pyproperty(magic)]
fn annotations(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__annotations__", vm)
}

#[pyproperty(magic)]
fn doc(&self, vm: &VirtualMachine) -> PyResult {
self.callable.get_attr("__doc__", vm)
}

#[pyproperty(magic)]
fn isabstractmethod(&self, vm: &VirtualMachine) -> PyObjectRef {
match vm.get_attribute_opt(self.callable.clone(), "__isabstractmethod__") {
Expand Down