Use json straight from json.rs

coolreader18 · coolreader18 · commit de1bc937e78b · 2019-03-19T22:20:10.000-05:00
diff --git a/vm/src/stdlib/json.rs b/vm/src/stdlib/json.rs
@@ -188,31 +188,31 @@ impl<'de> Visitor<'de> for PyObjectDeserializer<'de> {
     }
 }
 
+pub fn ser_pyobject(vm: &mut VirtualMachine, obj: &PyObjectRef) -> serde_json::Result<String> {
+    let serializer = PyObjectSerializer { pyobject: obj, vm };
+    serde_json::to_string(&serializer)
+}
+
+pub fn de_pyobject(vm: &mut VirtualMachine, s: &str) -> serde_json::Result<PyObjectRef> {
+    let de = PyObjectDeserializer { vm };
+    // TODO: Support deserializing string sub-classes
+    de.deserialize(&mut serde_json::Deserializer::from_str(s))
+}
+
 /// Implement json.dumps
 fn json_dumps(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     // TODO: Implement non-trivial serialisation case
     arg_check!(vm, args, required = [(obj, None)]);
-    let res = {
-        let serializer = PyObjectSerializer { pyobject: obj, vm };
-        serde_json::to_string(&serializer)
-    };
-    let string = res.map_err(|err| vm.new_type_error(format!("{}", err)))?;
+    let string = ser_pyobject(vm, obj).map_err(|err| vm.new_type_error(err.to_string()))?;
     Ok(vm.context().new_str(string))
 }
 
 /// Implement json.loads
 fn json_loads(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     // TODO: Implement non-trivial deserialization case
     arg_check!(vm, args, required = [(string, Some(vm.ctx.str_type()))]);
-    let res = {
-        let de = PyObjectDeserializer { vm };
-        // TODO: Support deserializing string sub-classes
-        de.deserialize(&mut serde_json::Deserializer::from_str(&objstr::get_value(
-            &string,
-        )))
-    };
-
-    res.map_err(|err| {
+
+    de_pyobject(vm, &objstr::get_value(&string)).map_err(|err| {
         let json_decode_error = vm
             .sys_module
             .get_item("modules")
diff --git a/vm/src/stdlib/mod.rs b/vm/src/stdlib/mod.rs
@@ -1,6 +1,6 @@
 mod ast;
 mod dis;
-mod json;
+pub mod json;
 mod keyword;
 mod math;
 mod platform;
diff --git a/wasm/lib/src/convert.rs b/wasm/lib/src/convert.rs
@@ -111,13 +111,14 @@ pub fn py_to_js(vm: &mut VirtualMachine, py_obj: PyObjectRef) -> JsValue {
 
             return func;
         }
-        // the browser module might not be injected
-        if let Ok(promise_type) = browser_module::import_promise_type(vm) {
-            if objtype::isinstance(&py_obj, &promise_type) {
-                return browser_module::get_promise_value(&py_obj).into();
-            }
+    }
+    // the browser module might not be injected
+    if let Ok(promise_type) = browser_module::import_promise_type(vm) {
+        if objtype::isinstance(&py_obj, &promise_type) {
+            return browser_module::get_promise_value(&py_obj).into();
         }
     }
+
     if objtype::isinstance(&py_obj, &vm.ctx.bytes_type())
         || objtype::isinstance(&py_obj, &vm.ctx.bytearray_type())
     {
@@ -129,15 +130,8 @@ pub fn py_to_js(vm: &mut VirtualMachine, py_obj: PyObjectRef) -> JsValue {
         }
         arr.into()
     } else {
-        let dumps = rustpython_vm::import::import_module(vm, std::path::PathBuf::default(), "json")
-            .expect("Couldn't get json module")
-            .get_attr("dumps".into())
-            .expect("Couldn't get json dumps");
-        match vm.invoke(dumps, PyFuncArgs::new(vec![py_obj], vec![])) {
-            Ok(value) => {
-                let json = vm.to_pystr(&value).unwrap();
-                js_sys::JSON::parse(&json).unwrap_or(JsValue::UNDEFINED)
-            }
+        match rustpython_vm::stdlib::json::ser_pyobject(vm, &py_obj) {
+            Ok(json) => js_sys::JSON::parse(&json).unwrap_or(JsValue::UNDEFINED),
             Err(_) => JsValue::UNDEFINED,
         }
     }
@@ -229,19 +223,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_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),
             Err(_) => return vm.get_none(),
         };
-        let py_json = vm.new_str(json);
-
-        vm.invoke(loads, PyFuncArgs::new(vec![py_json], vec![]))
-            // can safely unwrap because we know it's valid JSON
-            .unwrap()
+        rustpython_vm::stdlib::json::de_pyobject(vm, &json).unwrap_or_else(|_| vm.get_none())
     }
 }
