Skip to content

All exceptions are now modified with extend_exception! macro #2974

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 14 commits into from
Sep 15, 2021
Merged

All exceptions are now modified with extend_exception! macro #2974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ab09e7c
All exceptions are now modified with `extend_Exception!` macro
sobolevn Aug 26, 2021
9f34b4a
No extra `,` allowed
sobolevn Aug 26, 2021
943d9d4
Experiments
sobolevn Aug 28, 2021
81e3fd1
Uses `define_exception!` macro
sobolevn Aug 28, 2021
8030b59
Fixes CI
sobolevn Aug 28, 2021
eaba23c
Fixes typo
sobolevn Aug 28, 2021
c5eb0bd
Adds `init` as a macro parameter
sobolevn Aug 28, 2021
a69a866
Fixes CI
sobolevn Aug 28, 2021
f8d5fc8
Fixes CI
sobolevn Aug 28, 2021
77e6591
Fixes CI
sobolevn Aug 28, 2021
a167b06
Fixes CI
sobolevn Aug 29, 2021
bc48ca6
Fixes CI
sobolevn Aug 29, 2021
8622e3c
My wild guess
sobolevn Aug 29, 2021
63db6d7
rebased code
sobolevn Sep 15, 2021
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
rebased code
  • Loading branch information
@sobolevn
sobolevn committed Sep 15, 2021
commit 63db6d78b429e416b837d173495de5c51e454423
2 changes: 1 addition & 1 deletion derive/src/pyclass.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ pub(crate) fn impl_define_exception(
cls: PyTypeRef,
args: FuncArgs,
vm: &VirtualMachine,
) -> PyResult<PyBaseExceptionRef> {
) -> PyResult {
#tp_new_slot
}

Expand Down
8 changes: 2 additions & 6 deletions vm/src/exceptions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,8 @@ impl PyBaseException {
}
}

fn base_exception_new(
cls: PyTypeRef,
args: FuncArgs,
vm: &VirtualMachine,
) -> PyResult<PyRef<PyBaseException>> {
PyBaseException::new(args.args, vm).into_ref_with_type(vm, cls)
fn base_exception_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyBaseException::tp_new(cls, args, vm)
}

pub fn chain<T>(e1: PyResult<()>, e2: PyResult<T>) -> PyResult<T> {
Expand Down