Skip to content

Add frozen package support #1185

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
coolreader18 merged 2 commits into from
Jul 27, 2019
Merged

Add frozen package support #1185

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a72ef1e
Add frozen package support
coolreader18 Jul 27, 2019
ec6c016
Fix wasm errors
coolreader18 Jul 27, 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
Fix wasm errors
  • Loading branch information
@coolreader18
coolreader18 committed Jul 27, 2019
commit ec6c016fa56d6c9c7f6f2e3518ceeab5dacec0d4
10 changes: 3 additions & 7 deletions wasm/lib/src/convert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,9 @@ pub fn py_err_to_js_err(vm: &VirtualMachine, py_err: &PyObjectRef) -> JsValue {
}
};
}
let msg = match vm
.get_attribute(py_err.clone(), "msg")
.ok()
.and_then(|msg| vm.to_pystr(&msg).ok())
{
Some(msg) => msg,
None => return js_sys::Error::new("error getting error").into(),
let msg = match vm.to_pystr(py_err) {
Ok(msg) => msg,
Err(_) => return js_sys::Error::new("error getting error").into(),
};
let js_err = map_exceptions!(py_err,& msg, {
// TypeError is sort of a catch-all for "this value isn't what I thought it was like"
Expand Down