pyodide 0.18.0 → 0.19.0

package/pyproxy.gen.js

@@ -132,11 +132,8 @@
  * the callPyObject method, but of course one can also execute arbitrary code
  * via the various __dundermethods__ associated to classes.
  *
- * The only entrypoint into Python that avoids this file is our bootstrap method
- * runPythonSimple which is defined in main.c
- *
  * Any time we call into wasm, the call should be wrapped in a try catch block.
- * This way if a Javascript error emerges from the wasm, we can escalate it to a
+ * This way if a JavaScript error emerges from the wasm, we can escalate it to a
  * fatal error.
  *
  * This is file is preprocessed with -imacros "pyproxy.c". As a result of this,
@@ -160,6 +157,7 @@ Module.isPyProxy = isPyProxy;
 
 if (globalThis.FinalizationRegistry) {
   Module.finalizationRegistry = new FinalizationRegistry(([ptr, cache]) => {
+    cache.leaked = (!!1);
     pyproxy_decref_cache(cache);
     try {
       Module._Py_DecRef(ptr);
@@ -172,7 +170,7 @@ if (globalThis.FinalizationRegistry) {
   // For some unclear reason this code screws up selenium FirefoxDriver. Works
   // fine in chrome and when I test it in browser. It seems to be sensitive to
   // changes that don't make a difference to the semantics.
-  // TODO: after v0.17.0 release, fix selenium issues with this code.
+  // TODO: after 0.18.0, fix selenium issues with this code.
   // Module.bufferFinalizationRegistry = new FinalizationRegistry((ptr) => {
   //   try {
   //     Module._PyBuffer_Release(ptr);
@@ -248,7 +246,7 @@ Module.pyproxy_new = function (ptrobj, cache) {
   }
   cache.refcnt++;
   Object.defineProperty(target, "$$", {
-    value: { ptr: ptrobj, type: "PyProxy", borrowed: (!!0), cache },
+    value: { ptr: ptrobj, type: "PyProxy", cache },
   });
   Module._Py_IncRef(ptrobj);
   let proxy = new Proxy(target, PyProxyHandlers);
@@ -318,9 +316,6 @@ Module.getPyProxyClass = function (flags) {
 
 // Static methods
 Module.PyProxy_getPtr = _getPtr;
-Module.pyproxy_mark_borrowed = function (proxy) {
-  proxy.$$.borrowed = (!!1);
-};
 
 const pyproxy_cache_destroyed_msg =
   "This borrowed attribute proxy was automatically destroyed in the " +
@@ -334,18 +329,21 @@ function pyproxy_decref_cache(cache) {
   if (cache.refcnt === 0) {
     let cache_map = Module.hiwire.pop_value(cache.cacheId);
     for (let proxy_id of cache_map.values()) {
-      Module.pyproxy_destroy(
-        Module.hiwire.pop_value(proxy_id),
-        pyproxy_cache_destroyed_msg
-      );
+      const cache_entry = Module.hiwire.pop_value(proxy_id);
+      if (!cache.leaked) {
+        Module.pyproxy_destroy(cache_entry, pyproxy_cache_destroyed_msg);
+      }
     }
   }
 }
 
 Module.pyproxy_destroy = function (proxy, destroyed_msg) {
+  if (proxy.$$.ptr === null) {
+    return;
+  }
   let ptrobj = _getPtr(proxy);
   Module.finalizationRegistry.unregister(proxy);
-  // Maybe the destructor will call Javascript code that will somehow try
+  // Maybe the destructor will call JavaScript code that will somehow try
   // to use this proxy. Mark it deleted before decrementing reference count
   // just in case!
   proxy.$$.ptr = null;
@@ -360,7 +358,7 @@ Module.pyproxy_destroy = function (proxy, destroyed_msg) {
 };
 
 // Now a lot of boilerplate to wrap the abstract Object protocol wrappers
-// defined in pyproxy.c in Javascript functions.
+// defined in pyproxy.c in JavaScript functions.
 
 Module.callPyObjectKwargs = function (ptrobj, ...jsargs) {
   // We don't do any checking for kwargs, checks are in PyProxy.callKwargs
@@ -462,9 +460,7 @@ class PyProxyClass {
    *        destroyed".
    */
   destroy(destroyed_msg) {
-    if (!this.$$.borrowed) {
-      Module.pyproxy_destroy(this, destroyed_msg);
-    }
+    Module.pyproxy_destroy(this, destroyed_msg);
   }
   /**
    * Make a new PyProxy pointing to the same Python object.
@@ -476,7 +472,7 @@ class PyProxyClass {
     return Module.pyproxy_new(ptrobj, this.$$.cache);
   }
   /**
-   * Converts the ``PyProxy`` into a Javascript object as best as possible. By
+   * Converts the ``PyProxy`` into a JavaScript object as best as possible. By
    * default does a deep conversion, if a shallow conversion is desired, you can
    * use ``proxy.toJs({depth : 1})``. See :ref:`Explicit Conversion of PyProxy
    * <type-translations-pyproxy-to-js>` for more info.
@@ -490,14 +486,14 @@ class PyProxyClass {
    * generated structure. The most common use case is to create a new empty
    * list, pass the list as `pyproxies`, and then later iterate over `pyproxies`
    * to destroy all of created proxies.
-   * @param {bool} [options.create_pyproxies] If false, ``toJs`` will throw a
+   * @param {boolean} [options.create_pyproxies] If false, ``toJs`` will throw a
    * ``ConversionError`` rather than producing a ``PyProxy``.
-   * @param {bool} [options.dict_converter] A function to be called on an
+   * @param {boolean} [options.dict_converter] A function to be called on an
    * iterable of pairs ``[key, value]``. Convert this iterable of pairs to the
    * desired output. For instance, ``Object.fromEntries`` would convert the dict
    * to an object, ``Array.from`` converts it to an array of entries, and ``(it) =>
    * new Map(it)`` converts it to a ``Map`` (which is the default behavior).
-   * @return {any} The Javascript object resulting from the conversion.
+   * @return {any} The JavaScript object resulting from the conversion.
    */
   toJs({
     depth = -1,
@@ -768,8 +764,6 @@ class PyProxyContainsMethods {
   }
 }
 
-class TempError extends Error {}
-
 /**
  * A helper for [Symbol.iterator].
  *
@@ -788,26 +782,19 @@ class TempError extends Error {}
  */
 function* iter_helper(iterptr, token) {
   try {
-    if (iterptr === 0) {
-      throw new TempError();
-    }
     let item;
     while ((item = Module.__pyproxy_iter_next(iterptr))) {
       yield Module.hiwire.pop_value(item);
     }
-    if (Module._PyErr_Occurred()) {
-      throw new TempError();
-    }
   } catch (e) {
-    if (e instanceof TempError) {
-      Module._pythonexc2js();
-    } else {
-      Module.fatal_error(e);
-    }
+    Module.fatal_error(e);
   } finally {
     Module.finalizationRegistry.unregister(token);
     Module._Py_DecRef(iterptr);
   }
+  if (Module._PyErr_Occurred()) {
+    Module._pythonexc2js();
+  }
 }
 
 /**
@@ -840,6 +827,9 @@ class PyProxyIterableMethods {
     } catch (e) {
       Module.fatal_error(e);
     }
+    if (iterptr === 0) {
+      Module._pythonexc2js();
+    }
 
     let result = iter_helper(iterptr, token);
     Module.finalizationRegistry.register(result, [iterptr, undefined], token);
@@ -1004,7 +994,7 @@ let PyProxyHandlers = {
   },
   get(jsobj, jskey) {
     // Preference order:
-    // 1. stuff from Javascript
+    // 1. stuff from JavaScript
     // 2. the result of Python getattr
 
     // python_getattr will crash if given a Symbol.
@@ -1050,7 +1040,7 @@ let PyProxyHandlers = {
     }
     python_delattr(jsobj, jskey);
     // Must return "false" if "jskey" is a nonconfigurable own property.
-    // Otherwise Javascript will throw a TypeError.
+    // Otherwise JavaScript will throw a TypeError.
     return !descr || descr.configurable;
   },
   ownKeys(jsobj) {
@@ -1078,7 +1068,7 @@ let PyProxyHandlers = {
  */
 
 /**
- * The Promise / javascript awaitable API.
+ * The Promise / JavaScript awaitable API.
  * @private
  */
 class PyProxyAwaitableMethods {
@@ -1089,6 +1079,9 @@ class PyProxyAwaitableMethods {
    * @private
    */
   _ensure_future() {
+    if (this.$$.promise) {
+      return this.$$.promise;
+    }
     let ptrobj = _getPtr(this);
     let resolveHandle;
     let rejectHandle;
@@ -1114,6 +1107,8 @@ class PyProxyAwaitableMethods {
     if (errcode === -1) {
       Module._pythonexc2js();
     }
+    this.$$.promise = promise;
+    this.destroy();
     return promise;
   }
   /**
@@ -1238,14 +1233,14 @@ let type_to_array_map = new Map([
  */
 class PyProxyBufferMethods {
   /**
-   * Get a view of the buffer data which is usable from Javascript. No copy is
+   * Get a view of the buffer data which is usable from JavaScript. No copy is
    * ever performed.
    *
    * Present only if the proxied Python object supports the `Python Buffer
    * Protocol <https://docs.python.org/3/c-api/buffer.html>`_.
    *
    * We do not support suboffsets, if the buffer requires suboffsets we will
-   * throw an error. Javascript nd array libraries can't handle suboffsets
+   * throw an error. JavaScript nd array libraries can't handle suboffsets
    * anyways. In this case, you should use the :any:`toJs` api or copy the
    * buffer to one that doesn't use suboffets (using e.g.,
    * `numpy.ascontiguousarray
@@ -1391,7 +1386,7 @@ class PyProxyBufferMethods {
  */
 
 /**
- * A class to allow access to a Python data buffers from Javascript. These are
+ * A class to allow access to a Python data buffers from JavaScript. These are
  * produced by :any:`PyProxy.getBuffer` and cannot be constructed directly.
  * When you are done, release it with the :any:`release <PyBuffer.release>`
  * method.  See
@@ -1562,50 +1557,3 @@ export class PyBuffer {
     this.data = null;
   }
 }
-
-// A special proxy that we use to wrap pyodide.globals to allow property
-// access like `pyodide.globals.x`.
-let globalsPropertyAccessWarned = (!!0);
-let globalsPropertyAccessWarningMsg =
-  "Access to pyodide.globals via pyodide.globals.key is deprecated and " +
-  "will be removed in version 0.18.0. Use pyodide.globals.get('key'), " +
-  "pyodide.globals.set('key', value), pyodide.globals.delete('key') instead.";
-let NamespaceProxyHandlers = {
-  has(obj, key) {
-    return Reflect.has(obj, key) || obj.has(key);
-  },
-  get(obj, key) {
-    if (Reflect.has(obj, key)) {
-      return Reflect.get(obj, key);
-    }
-    let result = obj.get(key);
-    if (!globalsPropertyAccessWarned && result !== undefined) {
-      console.warn(globalsPropertyAccessWarningMsg);
-      globalsPropertyAccessWarned = (!!1);
-    }
-    return result;
-  },
-  set(obj, key, value) {
-    if (Reflect.has(obj, key)) {
-      throw new Error(`Cannot set read only field ${key}`);
-    }
-    if (!globalsPropertyAccessWarned) {
-      globalsPropertyAccessWarned = (!!1);
-      console.warn(globalsPropertyAccessWarningMsg);
-    }
-    obj.set(key, value);
-  },
-  ownKeys(obj) {
-    let result = new Set(Reflect.ownKeys(obj));
-    let iter = obj.keys();
-    for (let key of iter) {
-      result.add(key);
-    }
-    iter.destroy();
-    return Array.from(result);
-  },
-};
-
-export function wrapNamespace(ns) {
-  return new Proxy(ns, NamespaceProxyHandlers);
-}