jprdonnelly/pyscript
1
0
Fork 0
mirror of https://github.com/pyscript/pyscript.git synced 2025-12-20 18:55:29 -05:00
Code Issues Projects Releases Wiki Activity

minor changes to make linting happier (#598)

Browse Source 
* minor changes to make linting happy

* remove cast since linter wasn't happy

* address PR comments
This commit is contained in:
Fabio Pliger
2022-07-28 15:30:03 -05:00
committed by GitHub
parent 9102768366
commit 8e1cd0b268
9 changed files with 35 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pyscriptjs/src/components/base.ts
View File

@@ -1,22 +1,13 @@
import { loadedEnvironments, mode, pyodideLoaded, type Environment } from '../stores';
import { pyodideLoaded } from '../stores';
import { guidGenerator, addClasses, removeClasses } from '../utils';
import type { PyodideInterface } from '../pyodide';
// Premise used to connect to the first available pyodide interpreter
let runtime;
let environments: Record<Environment['id'], Environment> = {};
let currentMode;
let runtime: PyodideInterface;
let Element;
pyodideLoaded.subscribe(value => {
runtime = value;
});
loadedEnvironments.subscribe(value => {
environments = value;
});
mode.subscribe(value => {
currentMode = value;
});
export class BaseEvalElement extends HTMLElement {
shadow: ShadowRoot;
@@ -120,30 +111,29 @@ export class BaseEvalElement extends HTMLElement {
console.log('evaluate');
this.preEvaluate();
const pyodide = runtime;
let source: string;
let output;
let output: string;
try {
source = this.source ? await this.getSourceFromFile(this.source)
: this.getSourceFromElement();
const is_async = source.includes('asyncio')
await this._register_esm(pyodide);
await this._register_esm(runtime);
if (is_async) {
await pyodide.runPythonAsync(
<string>await runtime.runPythonAsync(
`output_manager.change(out="${this.outputElement.id}", err="${this.errorElement.id}", append=${this.appendOutput ? 'True' : 'False'})`,
);
output = await pyodide.runPythonAsync(source);
output = <string>await runtime.runPythonAsync(source);
} else {
output = pyodide.runPython(
output = <string>runtime.runPython(
`output_manager.change(out="${this.outputElement.id}", err="${this.errorElement.id}", append=${this.appendOutput ? 'True' : 'False'})`,
);
output = pyodide.runPython(source);
output = <string>runtime.runPython(source);
}
if (output !== undefined) {
if (Element === undefined) {
Element = pyodide.globals.get('Element');
Element = <Element>runtime.globals.get('Element');
}
const out = Element(this.outputElement.id);
out.write.callKwargs(output, { append: this.appendOutput });
@@ -152,8 +142,8 @@ export class BaseEvalElement extends HTMLElement {
this.outputElement.style.display = 'block';
}
is_async ? await pyodide.runPythonAsync(`output_manager.revert()`)
: await pyodide.runPython(`output_manager.revert()`);
is_async ? await runtime.runPythonAsync(`output_manager.revert()`)
: await runtime.runPython(`output_manager.revert()`);
// check if this REPL contains errors, delete them and remove error classes
const errorElements = document.querySelectorAll(`div[id^='${this.errorElement.id}'][error]`);
@@ -171,7 +161,7 @@ export class BaseEvalElement extends HTMLElement {
this.postEvaluate();
} catch (err) {
if (Element === undefined) {
Element = pyodide.globals.get('Element');
Element = <Element>runtime.globals.get('Element');
}
const out = Element(this.errorElement.id);