lint and remove of textwrap in stdlib for micropython compatibility

fpliger · fpliger · commit 7c1a0d115e4d · 2024-05-07T11:44:28.000-05:00
diff --git a/pyscript.core/src/stdlib/pyscript/fetch.py b/pyscript.core/src/stdlib/pyscript/fetch.py
@@ -1,6 +1,7 @@
 import json
 
 import js
+
 from pyscript.util import as_bytearray
 
 
diff --git a/pyscript.core/src/stdlib/pyscript/magic_js.py b/pyscript.core/src/stdlib/pyscript/magic_js.py
@@ -4,6 +4,7 @@
 import js as globalThis
 from polyscript import config as _config
 from polyscript import js_modules
+
 from pyscript.util import NotSupported
 
 RUNNING_IN_WORKER = not hasattr(globalThis, "document")
diff --git a/pyscript.core/src/stdlib/pyscript/websocket.py b/pyscript.core/src/stdlib/pyscript/websocket.py
@@ -1,4 +1,5 @@
 import js
+
 from pyscript.util import as_bytearray
 
 code = "code"
diff --git a/pyscript.core/src/stdlib/pyweb/media.py b/pyscript.core/src/stdlib/pyweb/media.py
@@ -1,4 +1,5 @@
 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
@@ -1,10 +1,10 @@
 import inspect
 import sys
-from textwrap import dedent
 
-from pyscript import document, when, window
 from pyweb import JSProperty, pydom
 
+from pyscript import document, when, window
+
 #: A flag to show if MicroPython is the current Python interpreter.
 is_micropython = "MicroPython" in sys.version
 
diff --git a/pyscript.core/src/stdlib/pyweb/ui/markdown.py b/pyscript.core/src/stdlib/pyweb/ui/markdown.py
@@ -1,9 +1,10 @@
 """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
@@ -1,10 +1,8 @@
-import string
-from textwrap import dedent
-
-from pyscript import document, when, window
 from pyweb import JSProperty, pydom
 from pyweb.ui import elements as el
 
+from pyscript import document, when, window
+
 
 class ShoeBase(el.ElementBase):
     tag = "div"
diff --git a/pyscript.core/test/camera.py b/pyscript.core/test/camera.py
@@ -1,7 +1,8 @@
 from pyodide.ffi import create_proxy
-from pyscript import display, document, when, window
 from pyweb import media, pydom
 
+from pyscript import display, document, when, window
+
 devicesSelect = pydom["#devices"][0]
 video = pydom["video"][0]
 devices = {}
diff --git a/pyscript.core/test/pydom.html b/pyscript.core/test/pydom.html
@@ -8,7 +8,7 @@
   <script type="module" src="../dist/core.js"></script>
 </head>
 <body>
-  <script type="py" src="pydom.py"></script>
+  <script type="mpy" src="pydom.py"></script>
 
   <button id="just-a-button">Click For Time</button>
   <button id="color-button">Click For Color</button>
diff --git a/pyscript.core/test/pydom.py b/pyscript.core/test/pydom.py
@@ -1,10 +1,14 @@
 import random
+import sys
 import time
 from datetime import datetime as dt
 
-from pyscript import display, when
 from pyweb import pydom
 
+from pyscript import display, when
+
+display(sys.version, target="system-info")
+
 
 @when("click", "#just-a-button")
 def on_click():
diff --git a/pyscript.core/test/pyscript_dom/run_tests.py b/pyscript.core/test/pyscript_dom/run_tests.py
@@ -1,5 +1,6 @@
 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
@@ -1,9 +1,10 @@
 from unittest import mock
 
 import pytest
-from pyscript import document, when
 from pyweb import pydom
 
+from pyscript import document, when
+
 
 class TestDocument:
     def test__element(self):
diff --git a/pyscript.core/test/ui/demo.py b/pyscript.core/test/ui/demo.py
@@ -1,14 +1,18 @@
-from textwrap import dedent
+try:
+    from textwrap import dedent
+except ImportError:
+    dedent = lambda x: x
 
 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
@@ -1,4 +1,3 @@
-from pyscript import when, window
 from pyweb import pydom
 from pyweb.ui.elements import (
     a,
@@ -41,6 +40,8 @@
     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
@@ -1,14 +1,19 @@
+try:
+    from textwrap import dedent
+except ImportError:
+    dedent = lambda x: x
+
 import inspect
-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
@@ -3,6 +3,7 @@
 js.document.body.append("document patch ")
 
 import a
+
 from pyscript import RUNNING_IN_WORKER, display, sync
 
 display("Hello World", target="test", append=True)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import js`
	`2`	`+`
`2`	`3`	`from pyscript.util import as_bytearray`
`3`	`4`
`4`	`5`	`code = "code"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from pyodide.ffi import to_js`
	`2`	`+`
`2`	`3`	`from pyscript import window`
`3`	`4`
`4`	`5`