From 46690ca1a808811d7514ea8e6ac5fa7d4661d02e Mon Sep 17 00:00:00 2001 From: Fabio Pliger Date: Tue, 12 Apr 2022 13:09:44 -0500 Subject: [PATCH] remove pyscript being loaded externally for now --- pyscriptjs/examples/todo.py | 2 +- pyscriptjs/src/interpreter.ts | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pyscriptjs/examples/todo.py b/pyscriptjs/examples/todo.py index 1e3588d..e94bfb4 100644 --- a/pyscriptjs/examples/todo.py +++ b/pyscriptjs/examples/todo.py @@ -1,5 +1,5 @@ from datetime import datetime as dt -from pyscript import Element +# from pyscript import Element from js import console tasks = [] diff --git a/pyscriptjs/src/interpreter.ts b/pyscriptjs/src/interpreter.ts index 336fd20..9e4121a 100644 --- a/pyscriptjs/src/interpreter.ts +++ b/pyscriptjs/src/interpreter.ts @@ -96,9 +96,9 @@ class Element: pyscript = PyScript() ` -let loadInterpreter = async function(): any { - /* @ts-ignore */ +let loadInterpreter = async function(): Promise { console.log("creating pyodide runtime"); + /* @ts-ignore */ pyodide = await loadPyodide({ stdout: console.log, stderr: console.log @@ -108,15 +108,15 @@ let loadInterpreter = async function(): any { console.log("loading micropip"); await pyodide.loadPackage("micropip"); console.log('loading pyscript module'); - await pyodide.runPythonAsync(` - from pyodide.http import pyfetch - response = await pyfetch("/build/pyscript.py") - with open("pyscript.py", "wb") as f: - content = await response.bytes() - print(content) - f.write(content) - `) - let pkg = pyodide.pyimport("pyscript"); + // await pyodide.runPythonAsync(` + // from pyodide.http import pyfetch + // response = await pyfetch("/build/pyscript.py") + // with open("pyscript.py", "wb") as f: + // content = await response.bytes() + // print(content) + // f.write(content) + // `) + // let pkg = pyodide.pyimport("pyscript"); console.log("creating additional definitions"); let output = pyodide.runPython(additional_definitions); @@ -125,7 +125,7 @@ let loadInterpreter = async function(): any { return pyodide; } -let loadPackage = async function(package_name: string[] | string, runtime: any): any { +let loadPackage = async function(package_name: string[] | string, runtime: any): Promise { await runtime.loadPackage(package_name); }