0.8.3

pygame-web · Oct 11, 2023 · f9da862 · f9da862
1 parent b5ec252
commit f9da862
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/pygbag/support/pythonrc.py b/pygbag/support/pythonrc.py
@@ -1658,6 +1658,8 @@ def patch_panda3d_showbase():
         panda3d.core.loadPrcFileData("", "support-threads #f")
         panda3d.core.loadPrcFileData("", "textures-power-2 down")
         panda3d.core.loadPrcFileData("", "textures-square down")
+        # samples expect that
+        panda3d.core.loadPrcFileData("", "default-model-extension .egg")
 
         def run(*argv, **env):
             print("ShowBase.run patched to launch asyncio.run(main())")

diff --git a/pygbag/testserver.py b/pygbag/testserver.py
@@ -35,10 +35,11 @@
 
 CACHE = None
 
-try:
-    from future_fstrings import fstring_decode
-except:
-    fstring_decode = False
+# does not support {x=}
+#try:
+#    from future_fstrings import fstring_decode
+#except:
+fstring_decode = False
 
 
 try:

diff --git a/static/default.tmpl b/static/default.tmpl
@@ -1,9 +1,9 @@
-<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id="site" data-os="vtx,fs,snd,gui" async defer>#<!--
+<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id="site" data-python="cpython{{cookiecutter.PYBUILD}}" data-os="vtx,fs,snd,gui" async defer>#<!--
 
 print("""
 Loading {{cookiecutter.title}} from {{cookiecutter.archive}}.apk
     Pygbag Version : {{cookiecutter.version}}
-    Template Version : 0.8.2
+    Template Version : 0.8.3
     Python  : {{cookiecutter.PYBUILD}}
     CDN URL : {{cookiecutter.cdn}}
     Screen  : {{cookiecutter.width}}x{{cookiecutter.height}}

diff --git a/static/noctx.tmpl b/static/noctx.tmpl
@@ -1,9 +1,9 @@
-<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id="site" data-os="vtx,fs,snd,gui" async defer>#<!--
+<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id="site" data-python="cpython{{cookiecutter.PYBUILD}}" data-os="vtx,fs,snd,gui" async defer>#<!--
 
 print("""
 Loading {{cookiecutter.title}} from {{cookiecutter.archive}}.apk
     Pygbag Version : {{cookiecutter.version}}
-    Template Version : 0.8.2
+    Template Version : 0.8.3
     Python  : {{cookiecutter.PYBUILD}}
     CDN URL : {{cookiecutter.cdn}}
     Screen  : {{cookiecutter.width}}x{{cookiecutter.height}}

diff --git a/static/pythons.js b/static/pythons.js
@@ -2279,12 +2279,17 @@ console.warn("TODO: merge/replace location options over script options")
         vm.script.interpreter = "cpython"
         config.PYBUILD = pystr.substr(7) || "3.11"
     } else {
-        if (pystr.search('wapy')>=0) {
-            vm.script.interpreter = "wapy"
-            config.PYBUILD = pystr.substr(4) || "3.4"
+        if (pystr.search('python3')>=0) {
+            vm.script.interpreter = "python"
+            config.PYBUILD = pystr.substr(6) || "3.4"
         } else {
-            vm.script.interpreter = config.python || "cpython"
-            config.PYBUILD = pystr.substr(7) || "3.11"
+            if (pystr.search('wapy')>=0) {
+                vm.script.interpreter = "wapy"
+                config.PYBUILD = pystr.substr(4) || "3.4"
+            } else {
+                vm.script.interpreter = config.python || "cpython"
+                config.PYBUILD = pystr.substr(7) || "3.11"
+            }
         }
     }