0.9.2

Author: pmp-p

scripts/build-loader.sh

@@ -384,13 +384,6 @@ END
             done
             popd
         fi
-#echo "
-#    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-#    emsdk tot js gen temp fix
-#    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-#"
-#        sed -i 's/_glfwSetWindowContentScaleCallback_sig=iii/_glfwSetWindowContentScaleCallback_sig="iii"/g' \
-#         ${DIST_DIR}/python${PYMAJOR}${PYMINOR}/${MODE}.js
         du -hs ${DIST_DIR}/*
     else
         echo "pymain+loader linking failed"

src/pygbag/__init__.py

@@ -24,9 +24,9 @@
     VERSION = "0.0.0"
 
 # make aio available
-if not sys.platform in ('emscripten','wasi'):
+if not sys.platform in ("emscripten", "wasi"):
     # must be first for readline
-    sys.path.insert(0, str(Path(__file__).parent / "support" ))
+    sys.path.insert(0, str(Path(__file__).parent / "support"))
 sys.path.append(str(Path(__file__).parent / "support/cross"))
 
 

src/pygbag/__main__.py

@@ -139,8 +139,7 @@ class fake_EventTarget:
         clients = {}
         events = []
 
-        async def process(self):
-            ...
+        async def process(self): ...
 
     def patch_platform_system():
         return "Emscripten"
@@ -180,8 +179,7 @@ def system(cls):
             return "Linux"
 
         @classmethod
-        def no_op(cls, *argv, **kw):
-            ...
+        def no_op(cls, *argv, **kw): ...
 
         run = no_op
 

src/pygbag/aio.py

@@ -34,9 +34,11 @@
     if aio.pep0723.Config.dev_mode:
         aio.pep0723.Config.PKG_INDEXES.extend(["http://localhost:8000/archives/repo/"])
     else:
-        aio.pep0723.Config.PKG_INDEXES.extend([
-            os.environ.get('PYGPY', "https://pygame-web.github.io/archives/repo/"),
-        ])
+        aio.pep0723.Config.PKG_INDEXES.extend(
+            [
+                os.environ.get("PYGPY", "https://pygame-web.github.io/archives/repo/"),
+            ]
+        )
 
     import pygbag.__main__
 

src/pygbag/app.py

@@ -17,11 +17,12 @@
 
 from .__init__ import VERSION
 
-if '--no_ssl_check' in sys.argv:
+if "--no_ssl_check" in sys.argv:
     import ssl
+
     # ssl local server testing.
     ssl._create_default_https_context = ssl._create_unverified_context
-    #os.environ["REQUESTS_CA_BUNDLE"]="/etc/ssl/certs/ca-bundle.crt"
+    # os.environ["REQUESTS_CA_BUNDLE"]="/etc/ssl/certs/ca-bundle.crt"
     sys.argv.remove("--no_ssl_check")
 
 import pygbag
@@ -396,12 +397,11 @@ async def main_run(app_folder, mainscript, cdn=DEFAULT_CDN):
         "spdx": "cookiecutter.spdx",
         "version": VERSION,
         "PYBUILD": args.PYBUILD,
-        "COLUMNS" : args.COLUMNS,
-        "LINES" : args.LINES,
-        "CONSOLE" : args.CONSOLE,
+        "COLUMNS": args.COLUMNS,
+        "LINES": args.LINES,
+        "CONSOLE": args.CONSOLE,
     }
 
-
     pygbag.config = CC
 
     await pack.archive(f"{app_name}.apk", app_folder, build_dir)

src/pygbag/gathering.py

@@ -1,9 +1,11 @@
 import os
 from pathlib import Path
 
+
 class Error(Exception):
     pass
 
+
 def gather(root: Path, *kw):
     if root.is_file():
         if root.name == "main.py":

src/pygbag/optimizing.py

@@ -31,7 +31,7 @@
     "wav": "ogg",
     "bmp": "png",
     "mp3": "ogg",
-    "xm" : "ogg",
+    "xm": "ogg",
 }
 
 

src/pygbag/support/_xterm_parser/_types.py

@@ -11,19 +11,15 @@
 class MessageTarget(Protocol):
     """Protocol that must be followed by objects that can receive messages."""
 
-    async def _post_message(self, message: "Message") -> bool:
-        ...
+    async def _post_message(self, message: "Message") -> bool: ...
 
-    def post_message(self, message: "Message") -> bool:
-        ...
+    def post_message(self, message: "Message") -> bool: ...
 
 
 class EventTarget(Protocol):
-    async def _post_message(self, message: "Message") -> bool:
-        ...
+    async def _post_message(self, message: "Message") -> bool: ...
 
-    def post_message(self, message: "Message") -> bool:
-        ...
+    def post_message(self, message: "Message") -> bool: ...
 
 
 class UnusedParameter:

src/pygbag/support/cpythonrc.py

@@ -219,7 +219,7 @@ def dump_code():
 else:
 
     # for the various emulations/tools provided
-    sys.path.append('/data/data/org.python/assets')
+    sys.path.append("/data/data/org.python/assets")
 
     PyConfig["pkg_repolist"] = []
 
@@ -253,9 +253,9 @@ def dump_code():
     del home
 
 # now in pep0723
-#PYCONFIG_PKG_INDEXES = [
+# PYCONFIG_PKG_INDEXES = [
 #    os.environ.get('PYGPY', "https://pygame-web.github.io/archives/repo/"),
-#]
+# ]
 
 PyConfig["imports_ready"] = False
 PyConfig["pygbag"] = 0
@@ -688,8 +688,8 @@ async def preload_code(cls, code, callback=None, loaderhome=".", hint=""):
             if not len(Config.repos):
                 await aio.pep0723.async_repos()
 
-    # TODO switch to METADATA:Requires-Dist
-    #   see https://github.com/pygame-web/pygbag/issues/156
+                # TODO switch to METADATA:Requires-Dist
+                #   see https://github.com/pygame-web/pygbag/issues/156
 
                 for cdn in Config.PKG_INDEXES:
                     async with platform.fopen(Path(cdn) / Config.REPO_DATA) as source:
@@ -708,13 +708,13 @@ async def preload_code(cls, code, callback=None, loaderhome=".", hint=""):
             DBG(f"635: {maybe_wanted=} known failed {aio.pep0723.hint_failed=}")
 
             # FIXME use an hybrid wheel
-            if 'pyodide' in aio.pep0723.hint_failed:
+            if "pyodide" in aio.pep0723.hint_failed:
 
-                for no_need in ('_zengl','pyodide','beautifulsoup4'):
+                for no_need in ("_zengl", "pyodide", "beautifulsoup4"):
                     if no_need in maybe_wanted:
                         maybe_wanted.remove(no_need)
                 # force
-                maybe_wanted.append('beautifulsoup4')
+                maybe_wanted.append("beautifulsoup4")
 
             for dep in maybe_wanted:
                 if not dep in deps:
@@ -1073,10 +1073,10 @@ def urlretrieve(maybe_url, filename=None, reporthook=None, data=None):
                 PyConfig.pkg_indexes.append(redirect)
 
             print("807: DEV MODE ON", PyConfig.pkg_indexes)
-# now in pep0723
-#        else:
-#            # address cdn
-#            PyConfig.pkg_indexes = PYCONFIG_PKG_INDEXES
+        # now in pep0723
+        #        else:
+        #            # address cdn
+        #            PyConfig.pkg_indexes = PYCONFIG_PKG_INDEXES
 
         from platform import window, document, ffi
 
@@ -1375,6 +1375,7 @@ def __call__(self, callid, fn, *argv, **env):
                     return None
 
                 print(f"{self.__dlref}.{fn}({argv},{env}) {callid=}")
+
                 async def rv():
                     obj = await platform.jsiter(window.dlcall(callid, jshex))
                     return json.loads(obj)
@@ -1475,6 +1476,7 @@ def log(*argv, **kw):
     LOCK
 except:
     import builtins
+
     builtins.LOCK = False
 
 
@@ -1617,7 +1619,7 @@ async def main():
                         local = tmpdir / file
                         break
                 DBG("1862: import_site: found ", local)
-            elif str(source).startswith('http'):
+            elif str(source).startswith("http"):
                 print("Remote file :", source)
                 local = tmpdir / "remote.py"
                 await shell.exec(shell.wget(f"-O{local}", source))

src/pygbag/support/cross/__EMSCRIPTEN__.py

@@ -96,7 +96,7 @@ def requestAnimationFrame(fn):
             async def main():
                 while not aio.exit:
                     if len(AnimatedFrames):
-                        frames.append( AnimatedFrames.pop(0) )
+                        frames.append(AnimatedFrames.pop(0))
                     await asyncio.sleep(0)
 
             asyncio.run(main())
@@ -105,7 +105,7 @@ async def main():
 
     # just a workaround until bridge support js "options" from **kw
     def ffi(arg=0xDEADBEEF, **kw):
-        if arg==0xDEADBEEF:
+        if arg == 0xDEADBEEF:
             return window.JSON.parse(json.dumps(kw))
         return window.JSON.parse(json.dumps(arg))