Fix wasm code

palaviv · palaviv · commit da2d31dca80f · 2019-03-10T23:21:00.000+02:00
diff --git a/wasm/lib/src/browser_module.rs b/wasm/lib/src/browser_module.rs
@@ -4,9 +4,10 @@ use js_sys::Promise;
 use num_traits::cast::ToPrimitive;
 use rustpython_vm::obj::{objint, objstr};
 use rustpython_vm::pyobject::{
-    PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
+    AttributeProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult,
+    TypeProtocol,
 };
-use rustpython_vm::{import::import, VirtualMachine};
+use rustpython_vm::{import::import_module, VirtualMachine};
 use std::path::PathBuf;
 use wasm_bindgen::{prelude::*, JsCast};
 use wasm_bindgen_futures::{future_to_promise, JsFuture};
@@ -176,12 +177,10 @@ pub fn get_promise_value(obj: &PyObjectRef) -> Promise {
 }
 
 pub fn import_promise_type(vm: &mut VirtualMachine) -> PyResult {
-    import(
-        vm,
-        PathBuf::default(),
-        BROWSER_NAME,
-        &Some("Promise".into()),
-    )
+    match import_module(vm, PathBuf::default(), BROWSER_NAME)?.get_attr("Promise".into()) {
+        Some(promise) => Ok(promise),
+        None => Err(vm.new_not_implemented_error("No Promise".to_string())),
+    }
 }
 
 fn promise_then(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
diff --git a/wasm/lib/src/convert.rs b/wasm/lib/src/convert.rs
@@ -128,13 +128,10 @@ pub fn py_to_js(vm: &mut VirtualMachine, py_obj: PyObjectRef) -> JsValue {
         }
         arr.into()
     } else {
-        let dumps = rustpython_vm::import::import(
-            vm,
-            std::path::PathBuf::default(),
-            "json",
-            &Some("dumps".into()),
-        )
-        .expect("Couldn't get json.dumps function");
+        let dumps = rustpython_vm::import::import_module(vm, std::path::PathBuf::default(), "json")
+            .expect("Couldn't get json module")
+            .get_attr("dump".into())
+            .expect("Couldn't get json dumps");
         match vm.invoke(dumps, pyobject::PyFuncArgs::new(vec![py_obj], vec![])) {
             Ok(value) => {
                 let json = vm.to_pystr(&value).unwrap();
@@ -231,13 +228,10 @@ pub fn js_to_py(vm: &mut VirtualMachine, js_val: JsValue) -> PyObjectRef {
         // Because `JSON.stringify(undefined)` returns undefined
         vm.get_none()
     } else {
-        let loads = rustpython_vm::import::import(
-            vm,
-            std::path::PathBuf::default(),
-            "json",
-            &Some("loads".into()),
-        )
-        .expect("json.loads function to be available");
+        let loads = rustpython_vm::import::import_module(vm, std::path::PathBuf::default(), "json")
+            .expect("Couldn't get json module")
+            .get_attr("loads".into())
+            .expect("Couldn't get json dumps");
 
         let json = match js_sys::JSON::stringify(&js_val) {
             Ok(json) => String::from(json),
