10000 Add a selector to the HTML tag + export config by WebReflection · Pull Request #1773 · pyscript/pyscript · GitHub
[go: up one dir, main page]
Skip to content

Add a selector to the HTML tag + export config #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2023
Merged

Add a selector to the HTML tag + export config #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions pyscript.core/tests/integration/support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,9 +471,7 @@ def wait_for_pyscript(self, *, timeout=None, check_js_errors=True):
self.logger.log(
"wait_for_pyscript", f"Waited for {elapsed_ms/1000:.2f} s", color="yellow"
)
# We still don't know why this wait is necessary, but without it
# events aren't being triggered in the tests.
self.page.wait_for_timeout(100)
self.page.wait_for_selector("html.all-done")

SCRIPT_TAG_REGEX = re.compile('(<script type="py"|<py-script)')

Expand All @@ -487,15 +485,15 @@ def _pyscript_format(self, snippet, *, execution_thread, extra_head=""):
<html>
<head>
<link rel="stylesheet" href="{self.http_server_addr}/build/core.css">
<script
type="module"
src="{self.http_server_addr}/build/core.js"
></script>
<script type="module">
import {{ config }} from "{self.http_server_addr}/build/core.js";
globalThis.pyConfig = config.py;
globalThis.mpyConfig = config.mpy;
addEventListener(
'py:all-done',
() => {{
console.debug('---py:all-done---')
console.debug('---py:all-done---');
document.documentElement.classList.add('all-done');
}},
{{ once: true }}
);
Expand Down
2 changes: 1 addition & 1 deletion pyscript.core/tests/integration/test_02_display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,4 +461,4 @@ def test_image_renders_correctly(self):
)

img_src = self.page.locator("img").get_attribute("src")
assert img_src.startswith('data:image/png;charset=utf-8;base64')
assert img_src.startswith("data:image/png;charset=utf-8;base64")
15 changes: 6 additions & 9 deletions pyscript.core/tests/integration/test_py_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ def test_py_config_inline_pyscript(self):
</py-config>

<py-script async>
from pyscript import window, document
promise = await document.currentScript._pyodide.promise
window.console.log("config name:", promise.config.name)
from pyscript import window
window.console.log("config name:", window.pyConfig.name)
</py-script>
"""
)
Expand All @@ -40,9 +39,8 @@ def test_py_config_inline_scriptpy(self):
</py-config>

<script type="py" async>
from pyscript import window, document
promise = await document.currentScript._pyodide.promise
window.console.log("config name:", promise.config.name)
from pyscript import window
window.console.log("config name:", window.pyConfig.name)
</script>
"""
)
Expand All @@ -59,9 +57,8 @@ def test_py_config_external(self):
<py-config src="pyconfig.toml"></py-config>

<script type="py" async>
from pyscript import window, document
promise = await document.currentScript._pyodide.promise
window.console.log("config name:", promise.config.name)
from pyscript import window
window.console.log("config name:", window.pyConfig.name)
</script>
"""
)
Expand Down
0