Add pyproxy Reflect.ownKeys handler

Author: hoodmane

Lib/test/test_pyodide.py

@@ -385,6 +385,14 @@ class T:
         run_js("(o) => {o.a = 72}")(T)
         self.assertTrue(T.a == 72)
 
+    def test_pyproxy_ownkeys(self):
+        class T:
+            a = 7
+            b = "zz"
+
+        l = set(x for x in run_js("(o) => Reflect.ownKeys(o)")(T) if isinstance(x, str))
+        self.assertGreaterEqual(l, {"a", "b"})
+
     def test_pyproxy_call_simple(self):
         def f(x):
             return x * x + 7

Modules/_pyodide_core/pyproxy.c

@@ -237,6 +237,34 @@ _pyproxy_delattr(PyObject* pyobj, JsVal idkey)
   return success ? 0 : -1;
 }
 
+EMSCRIPTEN_KEEPALIVE JsVal
+_pyproxy_ownKeys(PyObject* pyobj)
+{
+  bool success = false;
+  PyObject* pydir = NULL;
+
+  pydir = PyObject_Dir(pyobj);
+  FAIL_IF_NULL(pydir);
+
+  JsVal dir = JsvArray_New();
+  Py_ssize_t n = PyList_Size(pydir);
+  FAIL_IF_MINUS_ONE(n);
+  for (Py_ssize_t i = 0; i < n; ++i) {
+    PyObject* pyentry = PyList_GetItem(pydir, i); /* borrowed */
+    JsVal entry = python2js(pyentry);
+    FAIL_IF_JS_ERROR(entry);
+    JsvArray_Push(dir, entry);
+  }
+
+  success = true;
+finally:
+  Py_CLEAR(pydir);
+  if (!success) {
+    return JS_ERROR;
+  }
+  return dir;
+}
+
 EMSCRIPTEN_KEEPALIVE int
 _pyproxy_contains(PyObject* pyobj, JsVal idkey)
 {

Modules/_pyodide_core/pyproxy.ts

@@ -21,6 +21,7 @@ declare function __pyproxy_hasattr(ptr: number, key: any): number;
 declare function __pyproxy_getattr(ptr: number, key: any, cache: Map<string, any>): any;
 declare function __pyproxy_setattr(ptr: number, key: any, val: any): number;
 declare function __pyproxy_delattr(ptr: number, key: any): number;
+declare function __pyproxy_ownKeys(ptr: number): (string | symbol)[];
 
 declare function __pyproxy_contains(ptr: number, key: any): number;
 declare function __pyproxy_getitem(ptr: number, key: any): any;
@@ -556,6 +557,22 @@ const PyProxyHandlers = {
     python_delattr(jsobj, jskey);
     return true;
   },
+  ownKeys(jsobj: PyProxy): (string | symbol)[] {
+    let ptrobj = _getPtr(jsobj);
+    let result;
+    try {
+      Py_ENTER();
+      result = __pyproxy_ownKeys(ptrobj);
+      Py_EXIT();
+    } catch (e) {
+      API.fatal_error(e);
+    }
+    if (result === Module.error) {
+      _pythonexc2js();
+    }
+    result.push(...Reflect.ownKeys(jsobj));
+    return result;
+  },
   apply(jsobj: PyProxy & Function, jsthis: any, jsargs: any): any {
     return jsobj.apply(jsthis, jsargs);
   },