Skip to content

Unify property like objects #635

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
cthulahoops merged 6 commits into from
Mar 10, 2019
Merged

Unify property like objects #635

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5abc674
Change property implementation to have rust payload and to use new
skinnyBat Mar 8, 2019
3fe32d0
Merge branch 'master' into property_refactor
skinnyBat Mar 8, 2019
2edfe4c
Migrate usage of member_descriptor and data_descriptor to
skinnyBat Mar 9, 2019
0ec034d
Change property.__new__ to use new style function and construct
skinnyBat Mar 9, 2019
3c3c1f2
Fixed new_attribute_error and added more tests for property
skinnyBat Mar 9, 2019
7d01323
Merge branch 'master' into property_refactor
skinnyBat Mar 9, 2019
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
Merge branch 'master' into property_refactor 
# Conflicts:
#	vm/src/function.rs
  • Loading branch information
@skinnyBat
skinnyBat committed Mar 9, 2019
commit 7d01323e0939a3ccf1e4804c0a77c9ea9cecb809
7 changes: 7 additions & 0 deletions vm/src/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ where
Err(vm.new_type_error(format!("{} is not a subtype of {}", subtype, basetype)))
}
}

pub fn as_object(&self) -> &PyObjectRef {
&self.obj
}
pub fn into_object(self) -> PyObjectRef {
self.obj
}
}

impl<T> Deref for PyRef<T>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.