gwchq-textjam 0.1.115 → 0.1.118

package/dist/assets/{PyodideWorkerd2b0583273d433314bf9.js → PyodideWorker36d2ab735d3886128aa9.js}

@@ -240,6 +240,13 @@ const PyodideWorker = () => {
     // user console while resolving imports and loading packages.
     suppressInternalStdStreams = true;
     const imports = await pyodide._api.pyodide_code.find_imports(python).toJs();
+
+    await pyodide.runPythonAsync(`
+      import builtins
+      if hasattr(builtins, "_original_open"):
+          builtins.open = builtins._original_open
+    `);
+
     await Promise.all(imports.map((name) => loadDependency(name)));
 
     checkIfStopped();
@@ -256,6 +263,11 @@ const PyodideWorker = () => {
       MAX_FILE_SIZE = 8500000
       PROJECT_ROOT = os.path.abspath("${WORKING_DIR}")
 
+      if not hasattr(builtins, "_original_open"):
+          builtins._original_open = builtins.open
+
+      ORIGINAL_OPEN = builtins._original_open
+
       def _is_project_file(filename):
           abs_path = os.path.abspath(filename)
           return abs_path == PROJECT_ROOT or abs_path.startswith(PROJECT_ROOT + os.sep)
@@ -265,6 +277,7 @@ const PyodideWorker = () => {
           return os.path.relpath(abs_path, PROJECT_ROOT)
 
       def _custom_open(filename, mode="r", *args, **kwargs):
+          import os
           abs_path = os.path.abspath(filename)
 
           if "x" in mode and os.path.exists(abs_path):
@@ -285,7 +298,7 @@ const PyodideWorker = () => {
                       self.content += content
                       if len(self.content) > MAX_FILE_SIZE:
                           raise OSError(f"File '{self.filename}' exceeds maximum file size of {MAX_FILE_SIZE} bytes")
-                      with _original_open(self.filename, mode, *args, **kwargs) as f:
+                      with ORIGINAL_OPEN(self.filename, mode, *args, **kwargs) as f:
                           f.write(self.content)
                       basthon.kernel.write_file({
                           "filename": _to_project_relative(self.filename),
@@ -304,7 +317,7 @@ const PyodideWorker = () => {
 
               return CustomFile(abs_path)
           else:
-              return _original_open(filename, mode, *args, **kwargs)
+              return ORIGINAL_OPEN(filename, mode, *args, **kwargs)
 
       # Override the built-in open function
       builtins.open = _custom_open
@@ -592,18 +605,24 @@ const PyodideWorker = () => {
     postMessage({ method: "handleLoading" });
     try {
       await pyodide.runPythonAsync(`
-        # Clear all user-defined variables and modules
-        for name in list(globals()):
-          if not name.startswith('_') and not name=='basthon':
-            del globals()[name]
-
-        import sys
-        # Remove user modules from sys.modules
-        user_modules = ${JSON.stringify(userModuleNames)}
-        for name in user_modules:
-          if name in sys.modules:
-            del sys.modules[name]
-        `);
+          import builtins
+          import sys
+
+          # Restore the real open before cleaning up
+          if hasattr(builtins, "_original_open"):
+            builtins.open = builtins._original_open
+
+          # Remove user modules from sys.modules
+          user_modules = ${JSON.stringify(userModuleNames)}
+          for name in user_modules:
+            if name in sys.modules:
+              del sys.modules[name]
+
+          # Clear all user-defined variables and modules
+          for name in list(globals()):
+            if not name.startswith('_') and name not in ('basthon', 'sys', 'builtins'):
+              del globals()[name]
+          `);
     } catch (error) {
       console.error("Error while clearing Pyodide data:", error);
     }
@@ -662,9 +681,11 @@ const PyodideWorker = () => {
     `);
 
     await pyodide.runPythonAsync(`
-    import builtins
-    # Save the original open function
-    _original_open = builtins.open
+      import builtins
+      # Save the original open function only once
+      if not hasattr(builtins, "_original_open"):
+          builtins._original_open = builtins.open
+      _original_open = builtins._original_open
     `);
 
     await pyodide.loadPackage("pyodide-http");