we can kill this ugly hack now

antocuni · antocuni · commit b60327f022fc · 2023-10-05T15:38:12.000+02:00
diff --git a/pyscript.core/src/core.js b/pyscript.core/src/core.js
@@ -75,19 +75,9 @@ const registerModule = ({ XWorker: $XWorker, interpreter, io }) => {
     interpreter.runPython(stdlib, { globals: interpreter.runPython("{}") });
 };
 
-// this is a super-ugly workaround for a polyscript issue: in theory I should
-// define a codeBeforeRunWorker hook inside py-terminal.js, but since it's a
-// lazy plugin, it is too late: https://github.com/pyscript/polyscript/issues/52
-const py_terminal_codeBeforeRunner = `
-from pyscript import pyterminal
-pyterminal.init()
-`;
-
 const workerHooks = {
     codeBeforeRunWorker: () =>
-        [stdlib, py_terminal_codeBeforeRunner, ...hooks.codeBeforeRunWorker]
-            .map(dedent)
-            .join("\n"),
+        [stdlib, ...hooks.codeBeforeRunWorker].map(dedent).join("\n"),
     codeBeforeRunWorkerAsync: () =>
         [stdlib, ...hooks.codeBeforeRunWorkerAsync].map(dedent).join("\n"),
     codeAfterRunWorker: () =>
diff --git a/pyscript.core/src/plugins/py-terminal.js b/pyscript.core/src/plugins/py-terminal.js
@@ -75,3 +75,8 @@ hooks.onWorkerReady.add(function (_, xworker) {
     xworker.sync.pyterminal_readline = t.readline;
     xworker.sync.pyterminal_write = t.write;
 });
+
+hooks.codeBeforeRunWorker.add(`
+from pyscript import pyterminal
+pyterminal.init()
+`);
