Skip to content

Add __annotations__ attribute to functions. #640

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
OddCoincidence merged 1 commit into from
Mar 9, 2019
Merged

Add __annotations__ attribute to functions. #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Add __annotations__ attribute to functions.
  • Loading branch information
@windelbouwman
windelbouwman committed Mar 9, 2019
commit 3f492e5a3f5df31ec2c280e2950db4b1bf5be01e
7 changes: 6 additions & 1 deletion tests/snippets/type_hints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@

# See also: https://github.com/RustPython/RustPython/issues/587

def curry(foo: int, bla=2) -> float:
def curry(foo: int, bla: int =2) -> float:
return foo * 3.1415926 * bla

assert curry(2) > 10

print(curry.__annotations__)
assert curry.__annotations__['foo'] is int
assert curry.__annotations__['return'] is float
assert curry.__annotations__['bla'] is int
9 changes: 2 additions & 7 deletions vm/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ impl Frame {
let _qualified_name = self.pop_value();
let code_obj = self.pop_value();

let _annotations = if flags.contains(bytecode::FunctionOpArg::HAS_ANNOTATIONS) {
let annotations = if flags.contains(bytecode::FunctionOpArg::HAS_ANNOTATIONS) {
self.pop_value()
} else {
vm.new_dict()
Expand All @@ -470,13 +470,8 @@ impl Frame {
let scope = self.scope.clone();
let obj = vm.ctx.new_function(code_obj, scope, defaults);

let annotation_repr = vm.to_pystr(&_annotations)?;
vm.ctx.set_attr(&obj, "__annotations__", annotations);

warn!(
"Type annotation must be stored in attribute! {:?}",
annotation_repr
);
// TODO: use annotations with set_attr here!
self.push_value(obj);
Ok(None)
}
Expand Down
2 changes: 1 addition & 1 deletion vm/src/pyobject.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ impl PyObject {
PyObject {
payload,
typ: Some(typ),
dict: None,
dict: Some(RefCell::new(PyAttributes::new())),
}
.into_ref()
}
Expand Down