Skip to content

Fix define_exception macro not to depend on local context #3130

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
DimitrisJim merged 1 commit into from
Sep 25, 2021
Merged

Fix define_exception macro not to depend on local context #3130

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
22 changes: 11 additions & 11 deletions derive/src/pyclass.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,11 @@ pub(crate) fn impl_define_exception(
#[pyexception(#class_name, #base_class)]
#[derive(Debug)]
#[doc = #docs]
struct #class_name {}
pub struct #class_name {}

// We need this to make extend mechanism work:
impl PyValue for #class_name {
fn class(vm: &VirtualMachine) -> &PyTypeRef {
impl ::rustpython_vm::PyValue for #class_name {
fn class(vm: &::rustpython_vm::VirtualMachine) -> &::rustpython_vm::builtins::PyTypeRef {
&vm.ctx.exceptions.#ctx_name
}
}
Expand All @@ -337,19 +337,19 @@ pub(crate) fn impl_define_exception(
impl #class_name {
#[pyslot]
pub(crate) fn tp_new(
cls: PyTypeRef,
args: FuncArgs,
vm: &VirtualMachine,
) -> PyResult {
cls: ::rustpython_vm::builtins::PyTypeRef,
args: ::rustpython_vm::function::FuncArgs,
vm: &::rustpython_vm::VirtualMachine,
) -> ::rustpython_vm::PyResult {
#tp_new_slot
}

#[pymethod(magic)]
pub(crate) fn init(
zelf: PyRef<PyBaseException>,
args: FuncArgs,
vm: &VirtualMachine,
) -> PyResult<()> {
zelf: ::rustpython_vm::PyRef<::rustpython_vm::exceptions::PyBaseException>,
args: ::rustpython_vm::function::FuncArgs,
vm: &::rustpython_vm::VirtualMachine,
) -> ::rustpython_vm::PyResult<()> {
#init_method
}
}
Expand Down
2 changes: 1 addition & 1 deletion derive/src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ fn func_sig(sig: &Signature) -> String {
if ty == "FuncArgs" {
return Some("*args, **kwargs".to_owned());
}
if ty == "& VirtualMachine" {
if ty.starts_with('&') && ty.ends_with("VirtualMachine") {
return None;
}
let ident = match arg.pat.as_ref() {
Expand Down