diff --git a/packages.d/hpy/hpy.sh b/packages.d/hpy/hpy.sh index f56d091..5aa4050 100755 --- a/packages.d/hpy/hpy.sh +++ b/packages.d/hpy/hpy.sh @@ -30,8 +30,8 @@ then else git clone --no-tags --depth 1 --single-branch --branch master https://github.com/hpyproject/hpy - wget https://github.com/hpyproject/hpy/archive/refs/tags/0.9.0rc2.tar.gz - tar xvfz 0.9.0rc2.tar.gz + #wget https://github.com/hpyproject/hpy/archive/refs/tags/0.9.0rc2.tar.gz + #tar xvfz 0.9.0rc2.tar.gz pushd $(pwd)/hpy # git submodule update --init --recursive diff --git a/pygbag/support/cross/__EMSCRIPTEN__.py b/pygbag/support/cross/__EMSCRIPTEN__.py index 7449658..b77669d 100644 --- a/pygbag/support/cross/__EMSCRIPTEN__.py +++ b/pygbag/support/cross/__EMSCRIPTEN__.py @@ -26,13 +26,13 @@ def shed_yield(): # those __dunder__ are usually the same used in C conventions. -try: - __UPY__ -except: - if hasattr(sys.implementation, "_mpy"): - builtins.__UPY__ = this - else: - builtins.__UPY__ = None +#try: +# __UPY__ +#except: +# if hasattr(sys.implementation, "_mpy"): +# builtins.__UPY__ = this +# else: +# builtins.__UPY__ = None # force use a fixed, tested version of uasyncio to avoid non-determinism diff --git a/pygbag/support/cross/aio/cross.py b/pygbag/support/cross/aio/cross.py index 23d10cc..3568995 100644 --- a/pygbag/support/cross/aio/cross.py +++ b/pygbag/support/cross/aio/cross.py @@ -15,7 +15,7 @@ if not defined("__UPY__"): - define("__UPY__", hasattr(sys, "print_exception") ) + define("__UPY__", hasattr(sys.implementation, "_mpy")) if not __UPY__: # setup exception display with same syntax as upy diff --git a/pygbag/support/pythonrc.py b/pygbag/support/pythonrc.py index 22dd2ac..2f7eb6d 100644 --- a/pygbag/support/pythonrc.py +++ b/pygbag/support/pythonrc.py @@ -653,6 +653,10 @@ async def preload_code(cls, code, callback=None, hint=""): @classmethod def interactive(cls, prompt=False): + if prompt: + TopLevel_async_handler.mute_state = False + TopLevel_async_handler.muted = False + if cls.is_interactive: return # if you don't reach that step diff --git a/scripts/build-rootfs.sh b/scripts/build-rootfs.sh index 21a24a4..8d9fc38 100755 --- a/scripts/build-rootfs.sh +++ b/scripts/build-rootfs.sh @@ -124,6 +124,10 @@ import secrets import plistlib from pkg_resources import resource_filename +# netpbm +from mimetypes import guess_type +from pprint import pprint + # pgex import typing try: