Add PyProxy set and delete

Author: hoodmane

Lib/test/test_pyodide.py

@@ -459,5 +459,16 @@ def test_pyproxy_get(self):
 
     def test_pyproxy_length(self):
         f = run_js("(x) => x.length")
-        for x in [{"x", "y", "z"}, [1,2,3], (1, "x"), {"x":2}]:
+        for x in [{"x", "y", "z"}, [1, 2, 3], (1, "x"), {"x": 2}]:
             self.assertEqual(f(x), len(x))
+
+    def test_pyproxy_set_del(self):
+        d = {"x": 2}
+        run_js("(d) => d.set('y', 3)")(d)
+        self.assertEqual(d["x"], 2)
+        self.assertEqual(d["y"], 3)
+        run_js("(d) => d.set('x', 7)")(d)
+        self.assertEqual(d["x"], 7)
+        self.assertEqual(d["y"], 3)
+        run_js("(d) => d.delete('x')")(d)
+        self.assertNotIn("x", d)

Modules/_pyodide_core/pyproxy.c

@@ -7,6 +7,7 @@
 #define HAS_CONTAINS           (1 << 0)
 #define HAS_GET                (1 << 1)
 #define HAS_LENGTH             (1 << 2)
+#define HAS_SET                (1 << 3)
 #define IS_CALLABLE            (1 << 4)
 
 EM_JS_VAL(JsVal, pyproxy_new, (PyObject * ptrobj), {
@@ -69,6 +70,7 @@ type_getflags(PyTypeObject* obj_type)
     result |= HAS_GET;
   }
   SET_FLAG_IF(HAS_LENGTH, seq_proto->sq_length || map_proto->mp_length);
+  SET_FLAG_IF(HAS_SET, map_proto->mp_ass_subscript || seq_proto->sq_ass_item);
   SET_FLAG_IF(IS_CALLABLE, obj_type->tp_call);
   return result;
 
@@ -129,7 +131,44 @@ _pyproxy_getitem(PyObject* pyobj,
     return JS_ERROR;
   }
   return result;
-};
+}
+
+EMSCRIPTEN_KEEPALIVE int
+_pyproxy_setitem(PyObject* pyobj, JsVal jskey, JsVal jsval)
+{
+  bool success = false;
+  PyObject* pykey = NULL;
+  PyObject* pyval = NULL;
+
+  pykey = js2python(jskey);
+  FAIL_IF_NULL(pykey);
+  pyval = js2python(jsval);
+  FAIL_IF_NULL(pyval);
+  FAIL_IF_MINUS_ONE(PyObject_SetItem(pyobj, pykey, pyval));
+
+  success = true;
+finally:
+  Py_CLEAR(pykey);
+  Py_CLEAR(pyval);
+  return success ? 0 : -1;
+}
+
+EMSCRIPTEN_KEEPALIVE int
+_pyproxy_delitem(PyObject* pyobj, JsVal idkey)
+{
+  bool success = false;
+  PyObject* pykey = NULL;
+
+  pykey = js2python(idkey);
+  FAIL_IF_NULL(pykey);
+  FAIL_IF_MINUS_ONE(PyObject_DelItem(pyobj, pykey));
+
+  success = true;
+finally:
+  Py_CLEAR(pykey);
+  return success ? 0 : -1;
+}
+
 
 /**
  * This sets up a call to _PyObject_Vectorcall. It's a helper function for

Modules/_pyodide_core/pyproxy.ts

@@ -19,6 +19,8 @@ declare function _pyproxy_getflags(ptr: number): number;
 
 declare function __pyproxy_contains(ptr: number, key: any): number;
 declare function __pyproxy_getitem(ptr: number, key: any): any;
+declare function __pyproxy_setitem(ptr: number, key: any, val: any): number;
+declare function __pyproxy_delitem(ptr: number, key: any): number;
 declare function __pyproxy_apply(
   ptr: number,
   jsargs: any[],
@@ -273,6 +275,7 @@ function getPyProxyClass(flags: number) {
     [HAS_CONTAINS, PyContainsMethods],
     [HAS_GET, PyGetItemMethods],
     [HAS_LENGTH, PyLengthMethods],
+    [HAS_SET, PySetItemMethods],
     [IS_CALLABLE, PyCallableMethods],
   ];
   for (let [feature_flag, methods] of FLAG_TYPE_PAIRS) {
@@ -504,7 +507,7 @@ interface PyProxyWithLength extends PyLengthMethods {}
 
 // Controlled by HAS_LENGTH, appears for any object with __len__ or sq_length
 // or mp_length methods
-export class PyLengthMethods {
+class PyLengthMethods {
   /**
    * The length of the object.
    */
@@ -526,6 +529,52 @@ export class PyLengthMethods {
 }
 
 
+
+interface PyProxyWithSet extends PySetItemMethods {}
+// Controlled by HAS_SET, appears for any class with __setitem__, __delitem__,
+// mp_ass_subscript,  or sq_ass_item.
+class PySetItemMethods {
+  /**
+   * This translates to the Python code ``obj[key] = value``.
+   *
+   * @param key The key to set.
+   * @param value The value to set it to.
+   */
+  set(key: any, value: any) {
+    let ptrobj = _getPtr(this);
+    let err;
+    try {
+      Py_ENTER();
+      err = __pyproxy_setitem(ptrobj, key, value);
+      Py_EXIT();
+    } catch (e) {
+      API.fatal_error(e);
+    }
+    if (err === -1) {
+      _pythonexc2js();
+    }
+  }
+  /**
+   * This translates to the Python code ``del obj[key]``.
+   *
+   * @param key The key to delete.
+   */
+  delete(key: any) {
+    let ptrobj = _getPtr(this);
+    let err;
+    try {
+      Py_ENTER();
+      err = __pyproxy_delitem(ptrobj, key);
+      Py_EXIT();
+    } catch (e) {
+      API.fatal_error(e);
+    }
+    if (err === -1) {
+      _pythonexc2js();
+    }
+  }
+}
+
 function _adjustArgs(proxyobj: any, jsthis: any, jsargs: any[]): any[] {
   const { captureThis, boundArgs, boundThis, isBound } =
     _getAttrs(proxyobj).props;