pyodide 0.23.0-alpha.1 → 0.23.0

package/console.html

@@ -9,7 +9,6 @@
       href="https://cdn.jsdelivr.net/npm/jquery.terminal@2.35.2/css/jquery.terminal.min.css"
       rel="stylesheet"
     />
-    <script src="./pyodide.js"></script>
     <style>
       .terminal {
         --size: 1.5;
@@ -67,11 +66,31 @@
     <div id="loading"></div>
     <script>
       "use strict";
+
       function sleep(s) {
         return new Promise((resolve) => setTimeout(resolve, s));
       }
 
       async function main() {
+        let indexURL = "./";
+        const urlParams = new URLSearchParams(window.location.search);
+        const buildParam = urlParams.get("build");
+        if (buildParam) {
+          if (["full", "debug", "pyc"].includes(buildParam)) {
+            indexURL = indexURL.replace(
+              "/full/",
+              "/" + urlParams.get("build") + "/",
+            );
+          } else {
+            console.warn(
+              'Invalid URL parameter: build="' +
+                buildParam +
+                '". Using default "full".',
+            );
+          }
+        }
+        const { loadPyodide } = await import(indexURL + "pyodide.mjs");
+
         let term;
         globalThis.pyodide = await loadPyodide({
           stdin: () => {
@@ -130,7 +149,8 @@
           term.pause();
           // multiline should be split (useful when pasting)
           for (const c of command.split("\n")) {
-            let fut = pyconsole.push(c);
+            const escaped = c.replaceAll(/\u00a0/g, " ");
+            let fut = pyconsole.push(escaped);
             term.set_prompt(fut.syntax_check === "incomplete" ? ps2 : ps1);
             switch (fut.syntax_check) {
               case "syntax-error":
@@ -158,7 +178,7 @@
                   }),
                 );
               }
-              if (pyodide.isPyProxy(value)) {
+              if (value instanceof pyodide.ffi.PyProxy) {
                 value.destroy();
               }
             } catch (e) {
@@ -211,12 +231,17 @@
         };
         term.ready = Promise.resolve();
         pyodide._api.on_fatal = async (e) => {
-          term.error(
-            "Pyodide has suffered a fatal error. Please report this to the Pyodide maintainers.",
-          );
-          term.error("The cause of the fatal error was:");
-          term.error(e);
-          term.error("Look in the browser console for more details.");
+          if (e.name === "Exit") {
+            term.error(e);
+            term.error("Pyodide exited and can no longer be used.");
+          } else {
+            term.error(
+              "Pyodide has suffered a fatal error. Please report this to the Pyodide maintainers.",
+            );
+            term.error("The cause of the fatal error was:");
+            term.error(e);
+            term.error("Look in the browser console for more details.");
+          }
           await term.ready;
           term.pause();
           await sleep(15);