diff --git a/pyscript.core/src/stdlib/pyscript/magic_js.py b/pyscript.core/src/stdlib/pyscript/magic_js.py index 5d704771..5a2b9b33 100644 --- a/pyscript.core/src/stdlib/pyscript/magic_js.py +++ b/pyscript.core/src/stdlib/pyscript/magic_js.py @@ -2,7 +2,6 @@ import sys import js as globalThis from polyscript import js_modules - from pyscript.util import NotSupported RUNNING_IN_WORKER = not hasattr(globalThis, "document") diff --git a/pyscript.core/src/stdlib/pyweb/media.py b/pyscript.core/src/stdlib/pyweb/media.py index ae21e1a0..9f0ffcda 100644 --- a/pyscript.core/src/stdlib/pyweb/media.py +++ b/pyscript.core/src/stdlib/pyweb/media.py @@ -1,5 +1,4 @@ from pyodide.ffi import to_js - from pyscript import window diff --git a/pyscript.core/src/stdlib/pyweb/ui/elements.py b/pyscript.core/src/stdlib/pyweb/ui/elements.py index 4b8de762..0fd015c7 100644 --- a/pyscript.core/src/stdlib/pyweb/ui/elements.py +++ b/pyscript.core/src/stdlib/pyweb/ui/elements.py @@ -1,8 +1,7 @@ from textwrap import dedent -from pyweb import JSProperty, js_property, pydom - from pyscript import document, when, window +from pyweb import JSProperty, js_property, pydom # Global attributes that all elements have (this list is a subset of the official one) # and tries to capture the most used ones diff --git a/pyscript.core/src/stdlib/pyweb/ui/markdown.py b/pyscript.core/src/stdlib/pyweb/ui/markdown.py index 6b830f5a..7b5a8a13 100644 --- a/pyscript.core/src/stdlib/pyweb/ui/markdown.py +++ b/pyscript.core/src/stdlib/pyweb/ui/markdown.py @@ -1,9 +1,8 @@ """Markdown module to generate web/HTML components from Markdown code""" +from pyscript import document, window from pyweb import pydom from pyweb.ui.elements import TextElementBase, script -from pyscript import document, window - class markdown(TextElementBase): """Markdown component to render HTML from Markdown code""" diff --git a/pyscript.core/src/stdlib/pyweb/ui/shoelace.py b/pyscript.core/src/stdlib/pyweb/ui/shoelace.py index e325afe0..fa04fc9e 100644 --- a/pyscript.core/src/stdlib/pyweb/ui/shoelace.py +++ b/pyscript.core/src/stdlib/pyweb/ui/shoelace.py @@ -1,11 +1,10 @@ import string from textwrap import dedent +from pyscript import document, when, window from pyweb import JSProperty, js_property, pydom from pyweb.ui import elements as el -from pyscript import document, when, window - class ShoeBase(pydom.Element): tag = "div" diff --git a/pyscript.core/test/camera.py b/pyscript.core/test/camera.py index 1a964702..c352606e 100644 --- a/pyscript.core/test/camera.py +++ b/pyscript.core/test/camera.py @@ -1,7 +1,6 @@ from pyodide.ffi import create_proxy -from pyweb import media, pydom - from pyscript import display, document, when, window +from pyweb import media, pydom devicesSelect = pydom["#devices"][0] video = pydom["video"][0] diff --git a/pyscript.core/test/pydom.py b/pyscript.core/test/pydom.py index c4bd31b7..ab8d0377 100644 --- a/pyscript.core/test/pydom.py +++ b/pyscript.core/test/pydom.py @@ -2,9 +2,8 @@ import random import time from datetime import datetime as dt -from pyweb import pydom - from pyscript import display, when +from pyweb import pydom @when("click", "#just-a-button") diff --git a/pyscript.core/test/pyscript_dom/run_tests.py b/pyscript.core/test/pyscript_dom/run_tests.py index f81c42e4..128abccc 100644 --- a/pyscript.core/test/pyscript_dom/run_tests.py +++ b/pyscript.core/test/pyscript_dom/run_tests.py @@ -1,6 +1,5 @@ print("tests starting") import pytest - from pyscript import window args = window.location.search.replace("?", "").split("&") diff --git a/pyscript.core/test/pyscript_dom/tests/test_dom.py b/pyscript.core/test/pyscript_dom/tests/test_dom.py index c4954bf2..49c96a5a 100644 --- a/pyscript.core/test/pyscript_dom/tests/test_dom.py +++ b/pyscript.core/test/pyscript_dom/tests/test_dom.py @@ -1,9 +1,8 @@ from unittest import mock import pytest -from pyweb import pydom - from pyscript import document, when +from pyweb import pydom class TestDocument: diff --git a/pyscript.core/test/ui/demo.py b/pyscript.core/test/ui/demo.py index dd3b8c69..c5c96af1 100644 --- a/pyscript.core/test/ui/demo.py +++ b/pyscript.core/test/ui/demo.py @@ -2,14 +2,13 @@ from textwrap import dedent import examples import styles +from pyscript import when, window from pyweb import pydom from pyweb.ui import elements as el from pyweb.ui import shoelace from pyweb.ui.elements import a, button, div, grid, h1, h2, h3, input_ from pyweb.ui.markdown import markdown -from pyscript import when, window - MAIN_PAGE_MARKDOWN = dedent( """ ## What is pyweb.ui? diff --git a/pyscript.core/test/ui/examples.py b/pyscript.core/test/ui/examples.py index db1bc83d..15bad4d1 100644 --- a/pyscript.core/test/ui/examples.py +++ b/pyscript.core/test/ui/examples.py @@ -1,3 +1,4 @@ +from pyscript import when, window from pyweb import pydom from pyweb.ui.elements import ( a, @@ -40,8 +41,6 @@ from pyweb.ui.shoelace import ( Textarea, ) -from pyscript import when, window - LOREM_IPSUM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat." details_code = """ LOREM_IPSUM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat." diff --git a/pyscript.core/test/ui/gallery.py b/pyscript.core/test/ui/gallery.py index 080ab2cd..2856646c 100644 --- a/pyscript.core/test/ui/gallery.py +++ b/pyscript.core/test/ui/gallery.py @@ -3,13 +3,12 @@ from textwrap import dedent import styles import tictactoe +from pyscript import when, window from pyweb import pydom from pyweb.ui import elements as el from pyweb.ui import shoelace from pyweb.ui.markdown import markdown -from pyscript import when, window - MAIN_PAGE_MARKDOWN = dedent( """ This gallery is a collection of demos using the PyWeb.UI library. There are meant diff --git a/pyscript.core/test/worker.py b/pyscript.core/test/worker.py index f408b1b6..84fd2940 100644 --- a/pyscript.core/test/worker.py +++ b/pyscript.core/test/worker.py @@ -3,7 +3,6 @@ import js js.document.body.append("document patch ") import a - from pyscript import RUNNING_IN_WORKER, display, sync display("Hello World", target="test", append=True)