Fix decorators #3783
Merged
Fix decorators #3783
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
related to #3742 |
a77ae32 to
f2e62cf
Compare
youknowone
requested changes
Jul 10, 2022
vm/src/builtins/classmethod.rs
Outdated
| } | ||
| } | ||
|
|
||
| impl Constructor for PyClassMethod { | ||
| type Args = PyObjectRef; | ||
|
|
||
| fn py_new(cls: PyTypeRef, callable: Self::Args, vm: &VirtualMachine) -> PyResult { | ||
| PyClassMethod { | ||
| let _callable = callable.clone(); |
There was a problem hiding this comment.
usually _ prefix means unused variable.
vm/src/builtins/classmethod.rs
Outdated
Comment on lines
81
to
84
| match obj.set_attr("__doc__", doc, vm) { | ||
| Err(e) => Err(e), | ||
| Ok(_) => result, | ||
| } |
There was a problem hiding this comment.
Suggested change
| match obj.set_attr("__doc__", doc, vm) { | |
| Err(e) => Err(e), | |
| Ok(_) => result, | |
| } | |
| obj.set_attr("__doc__", doc, vm)?; | |
| result |
vm/src/builtins/staticmethod.rs
Outdated
| @@ -41,9 +41,19 @@ impl Constructor for PyStaticMethod { | |||
| type Args = PyObjectRef; | |||
|
|
|||
| fn py_new(cls: PyTypeRef, callable: Self::Args, vm: &VirtualMachine) -> PyResult { | |||
| PyStaticMethod { callable } | |||
| let _callable = callable.clone(); | |||
|
Good points. I will change the codes. |
youknowone
requested changes
Jul 10, 2022
vm/src/builtins/classmethod.rs
Outdated
Comment on lines
58
to
62
| let _descr_get: PyResult<PyObjectRef> = zelf.callable.lock().get_attr("__get__", vm); | ||
| match _descr_get { | ||
| Err(_) => Ok(PyBoundMethod::new_ref(cls, zelf.callable.lock().clone(), &vm.ctx).into()), | ||
| Ok(_descr_get) => vm.invoke(&_descr_get, (cls.clone(), cls)), | ||
| } |
There was a problem hiding this comment.
_descr_get is unnecessarily _ prefixed
vm/src/builtins/classmethod.rs
Outdated
Comment on lines
77
to
78
| let doc = vm.unwrap_pyresult(doc); | ||
| let obj = vm.unwrap_pyresult(result.clone()); |
There was a problem hiding this comment.
I don't think this is a correct error handling.
Both of them can be Err and they will panic.
vm/src/builtins/classmethod.rs
Outdated
| } | ||
| } | ||
|
|
||
| impl Constructor for PyClassMethod { | ||
| type Args = PyObjectRef; | ||
|
|
||
| fn py_new(cls: PyTypeRef, callable: Self::Args, vm: &VirtualMachine) -> PyResult { | ||
| PyClassMethod { | ||
| callable: PyMutex::new(callable), | ||
| let result: PyResult<PyObjectRef> = PyClassMethod { |
There was a problem hiding this comment.
because PyResult = PyResult<PyObjectRef>, this is redundant.
vm/src/builtins/classmethod.rs
Outdated
| PyClassMethod { | ||
| callable: PyMutex::new(callable), | ||
| let result: PyResult<PyObjectRef> = PyClassMethod { | ||
| callable: PyMutex::new(callable.clone()), |
There was a problem hiding this comment.
try to get __doc__ before making PyClassMethod to avoid clone.
vm/src/builtins/classmethod.rs
Outdated
| PyClassMethod { | ||
| callable: PyMutex::new(callable), | ||
| let result: PyResult<PyObjectRef> = PyClassMethod { | ||
| callable: PyMutex::new(callable.clone()), | ||
| } | ||
| .into_ref_with_type(vm, cls) |
There was a problem hiding this comment.
i'd like to propagate error here before later handling
Suggested change
| .into_ref_with_type(vm, cls) | |
| .into_ref_with_type(vm, cls)? |
|
dependency of #3862 |
youknowone
requested changes
Jul 16, 2022
vm/src/builtins/classmethod.rs
Outdated
Comment on lines
78
to
81
| match doc { | ||
| Err(_) => None, | ||
| Ok(doc) => Some(obj.set_attr("__doc__", doc, vm)), | ||
| }; |
There was a problem hiding this comment.
Suggested change
| match doc { | |
| Err(_) => None, | |
| Ok(doc) => Some(obj.set_attr("__doc__", doc, vm)), | |
| }; | |
| if let Ok(doc) = doc { | |
| obj.set_attr("__doc__", doc, vm)?; | |
| } |
set_attr result need to be checked with ?
Check 'Named Expressions Need Not Be Parenthesized' Section
youknowone
approved these changes
Jul 16, 2022
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Except test_expressions in test_decorators.py file.
Now it is working with full test_decorators.py test file.