pyodide-py 0.26.0.dev0__tar.gz → 0.26.2__tar.gz

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyodide-py
-Version: 0.26.0.dev0
+Version: 0.26.2
 Summary: A Python package providing core interpreter functionality for Pyodide
 Author: Pyodide developers
 Project-URL: Homepage, https://github.com/pyodide/pyodide

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/_pyodide/_base.py

@@ -132,6 +132,8 @@ def _parse_and_compile_gen(
     mode: str = "exec",
     filename: str = "<exec>",
     flags: int = 0x0,
+    dont_inherit: bool = False,
+    optimize: int = -1,
 ) -> Generator[ast.Module, ast.Module, CodeType]:
     """Parse ``source``, then yield the AST, then compile the AST and return the
     code object.
@@ -160,7 +162,7 @@ def _parse_and_compile_gen(
         _last_expr_to_raise(mod)
 
     ast.fix_missing_locations(mod)
-    return compile(mod, filename, mode, flags=flags)
+    return compile(mod, filename, mode, flags, dont_inherit, optimize)
 
 
 ReturnMode = Literal["last_expr", "last_expr_or_assign", "none"]
@@ -214,6 +216,16 @@ class CodeRunner:
         The flags to compile with. See the documentation for the built-in
         :external:py:func:`compile` function.
 
+    dont_inherit :
+
+        Whether to inherit ``__future__`` imports from the outer code.
+        See the documentation for the built-in :external:py:func:`compile` function.
+
+    optimize :
+
+        Specifies the optimization level of the compiler. See the documentation
+        for the built-in :external:py:func:`compile` function.
+
     Examples
     --------
     >>> source = "1 + 1"
@@ -254,6 +266,8 @@ class CodeRunner:
         quiet_trailing_semicolon: bool = True,
         filename: str = "<exec>",
         flags: int = 0x0,
+        dont_inherit: bool = False,
+        optimize: int = -1,
     ):
         self._compiled = False
         self._source = source
@@ -264,6 +278,8 @@ class CodeRunner:
             quiet_trailing_semicolon=quiet_trailing_semicolon,
             filename=filename,
             flags=flags,
+            dont_inherit=dont_inherit,
+            optimize=optimize,
         )
         self.ast = next(self._gen)
 
@@ -407,6 +423,8 @@ def eval_code(
     quiet_trailing_semicolon: bool = True,
     filename: str = "<exec>",
     flags: int = 0x0,
+    dont_inherit: bool = False,
+    optimize: int = -1,
 ) -> Any:
     """Runs a string as Python source code.
 
@@ -497,6 +515,8 @@ def eval_code(
             quiet_trailing_semicolon=quiet_trailing_semicolon,
             filename=filename,
             flags=flags,
+            dont_inherit=dont_inherit,
+            optimize=optimize,
         )
         .compile()
         .run(globals, locals)
@@ -512,6 +532,8 @@ async def eval_code_async(
     quiet_trailing_semicolon: bool = True,
     filename: str = "<exec>",
     flags: int = 0x0,
+    dont_inherit: bool = False,
+    optimize: int = -1,
 ) -> Any:
     """Runs a code string asynchronously.
 
@@ -577,6 +599,8 @@ async def eval_code_async(
             quiet_trailing_semicolon=quiet_trailing_semicolon,
             filename=filename,
             flags=flags,
+            dont_inherit=dont_inherit,
+            optimize=optimize,
         )
         .compile()
         .run_async(globals, locals)

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/_pyodide/_core_docs.py

@@ -116,6 +116,16 @@ class JsProxy(metaclass=_JsProxyMetaClass):
             return super().__new__(cls)
         raise TypeError(f"{cls.__name__} cannot be instantiated.")
 
+    def bind_sig(self, signature: Any) -> "JsProxy":
+        """Creates a copy of the JsProxy with a signature bound to it.
+
+        .. admonition:: Experimental
+           :class: warning
+
+           This feature is not yet stable, nor really documented.
+        """
+        return self
+
     @property
     def js_id(self) -> int:
         """An id number which can be used as a dictionary/set key if you want to
@@ -365,14 +375,12 @@ class JsPromise(JsProxy, Generic[T]):
     @overload
     def then(
         self, onfulfilled: None, onrejected: Callable[[BaseException], Awaitable[S]], /
-    ) -> "JsPromise[S]":
-        ...
+    ) -> "JsPromise[S]": ...
 
     @overload
     def then(
         self, onfulfilled: None, onrejected: Callable[[BaseException], S], /
-    ) -> "JsPromise[S]":
-        ...
+    ) -> "JsPromise[S]": ...
 
     @overload
     def then(
@@ -380,8 +388,7 @@ class JsPromise(JsProxy, Generic[T]):
         onfulfilled: Callable[[T], Awaitable[S]],
         onrejected: Callable[[BaseException], Awaitable[S]] | None = None,
         /,
-    ) -> "JsPromise[S]":
-        ...
+    ) -> "JsPromise[S]": ...
 
     @overload
     def then(
@@ -389,8 +396,7 @@ class JsPromise(JsProxy, Generic[T]):
         onfulfilled: Callable[[T], S],
         onrejected: Callable[[BaseException], S] | None = None,
         /,
-    ) -> "JsPromise[S]":
-        ...
+    ) -> "JsPromise[S]": ...
 
     @docs_argspec(
         "(self, onfulfilled: Callable[[T], Awaitable[S] | S] | None, onrejected: Callable[[BaseException], Awaitable[S] | S] | None = None, /) -> 'JsPromise[S]'"
@@ -410,12 +416,10 @@ class JsPromise(JsProxy, Generic[T]):
     @overload
     def catch(
         self, onrejected: Callable[[BaseException], Awaitable[S]], /
-    ) -> "JsPromise[S]":
-        ...
+    ) -> "JsPromise[S]": ...
 
     @overload
-    def catch(self, onrejected: Callable[[BaseException], S], /) -> "JsPromise[S]":
-        ...
+    def catch(self, onrejected: Callable[[BaseException], S], /) -> "JsPromise[S]": ...
 
     @docs_argspec(
         "(self, onrejected: Callable[[BaseException], Awaitable[S] | S], /) -> 'JsPromise[S]'"
@@ -670,8 +674,7 @@ class JsGenerator(JsIterable[T_co], Generic[T_co, T_contra, V_co]):
         val: BaseException | object = ...,
         tb: TracebackType | None = ...,
         /,
-    ) -> T_co:
-        ...
+    ) -> T_co: ...
 
     @overload
     def throw(
@@ -680,8 +683,7 @@ class JsGenerator(JsIterable[T_co], Generic[T_co, T_contra, V_co]):
         val: None = ...,
         tb: TracebackType | None = ...,
         /,
-    ) -> T_co:
-        ...
+    ) -> T_co: ...
 
     @docs_argspec("(self, error: BaseException, /) -> T_co")
     def throw(
@@ -801,8 +803,7 @@ class JsAsyncGenerator(JsAsyncIterable[T_co], Generic[T_co, T_contra, V_co]):
         val: BaseException | object = ...,
         tb: TracebackType | None = ...,
         /,
-    ) -> Awaitable[T_co]:
-        ...
+    ) -> Awaitable[T_co]: ...
 
     @overload
     def athrow(
@@ -811,8 +812,7 @@ class JsAsyncGenerator(JsAsyncIterable[T_co], Generic[T_co, T_contra, V_co]):
         val: None = ...,
         tb: TracebackType | None = ...,
         /,
-    ) -> Awaitable[T_co]:
-        ...
+    ) -> Awaitable[T_co]: ...
 
     @docs_argspec("(self, error: BaseException, /) -> T_co")
     def athrow(self, value: Any, *args: Any) -> Awaitable[T_co]:
@@ -856,23 +856,19 @@ class JsArray(JsIterable[T], Generic[T], MutableSequence[T], metaclass=_ABCMeta)
     _js_type_flags = ["IS_ARRAY", "IS_NODE_LIST", "IS_TYPEDARRAY"]
 
     @overload
-    def __getitem__(self, idx: int) -> T:
-        ...
+    def __getitem__(self, idx: int) -> T: ...
 
     @overload
-    def __getitem__(self, idx: slice) -> "JsArray[T]":
-        ...
+    def __getitem__(self, idx: slice) -> "JsArray[T]": ...
 
     def __getitem__(self, idx):
         raise NotImplementedError
 
     @overload
-    def __setitem__(self, idx: int, value: T) -> None:
-        ...
+    def __setitem__(self, idx: int, value: T) -> None: ...
 
     @overload
-    def __setitem__(self, idx: slice, value: Iterable[T]) -> None:
-        ...
+    def __setitem__(self, idx: slice, value: Iterable[T]) -> None: ...
 
     def __setitem__(self, idx, value):
         pass
@@ -999,12 +995,10 @@ class JsMap(JsIterable[KT], Generic[KT, VT_co], Mapping[KT, VT_co], metaclass=_A
         raise NotImplementedError
 
     @overload
-    def get(self, key: KT, /) -> VT_co | None:
-        ...
+    def get(self, key: KT, /) -> VT_co | None: ...
 
     @overload
-    def get(self, key: KT, default: VT_co | T, /) -> VT_co | T:
-        ...
+    def get(self, key: KT, default: VT_co | T, /) -> VT_co | T: ...
 
     @docs_argspec("(self, key: KT, default: VT_co | None, /) -> VT_co")
     def get(self, key: KT, default: Any = None, /) -> VT_co:
@@ -1013,11 +1007,9 @@ class JsMap(JsIterable[KT], Generic[KT, VT_co], Mapping[KT, VT_co], metaclass=_A
 
 
 class _SupportsKeysAndGetItem(Protocol[KT, VT_co]):
-    def keys(self) -> Iterable[KT]:
-        ...
+    def keys(self) -> Iterable[KT]: ...
 
-    def __getitem__(self, __key: KT) -> VT_co:
-        ...
+    def __getitem__(self, __key: KT) -> VT_co: ...
 
 
 class JsMutableMap(
@@ -1037,12 +1029,10 @@ class JsMutableMap(
     _js_type_flags = ["HAS_GET | HAS_SET | HAS_LENGTH | IS_ITERABLE", "IS_OBJECT_MAP"]
 
     @overload
-    def pop(self, key: KT, /) -> VT:
-        ...
+    def pop(self, key: KT, /) -> VT: ...
 
     @overload
-    def pop(self, key: KT, default: VT | T = ..., /) -> VT | T:
-        ...
+    def pop(self, key: KT, default: VT | T = ..., /) -> VT | T: ...
 
     @docs_argspec("(self, key: KT, default: VT | None = None, /) -> VT")
     def pop(self, key: KT, default: Any = None, /) -> Any:
@@ -1067,16 +1057,13 @@ class JsMutableMap(
         """Empty out the map entirely."""
 
     @overload
-    def update(self, __m: _SupportsKeysAndGetItem[KT, VT], **kwargs: VT) -> None:
-        ...
+    def update(self, __m: _SupportsKeysAndGetItem[KT, VT], **kwargs: VT) -> None: ...
 
     @overload
-    def update(self, __m: Iterable[tuple[KT, VT]], **kwargs: VT) -> None:
-        ...
+    def update(self, __m: Iterable[tuple[KT, VT]], **kwargs: VT) -> None: ...
 
     @overload
-    def update(self, **kwargs: VT) -> None:
-        ...
+    def update(self, **kwargs: VT) -> None: ...
 
     @docs_argspec(
         "(self, other : Mapping[KT, VT] | Iterable[tuple[KT, VT]] = None , /, **kwargs) -> None"
@@ -1209,6 +1196,7 @@ class JsDomElement(JsProxy):
 # from pyproxy.c
 
 
+@docs_argspec("(obj: Callable[..., Any], /) -> JsOnceCallable")
 def create_once_callable(
     obj: Callable[..., Any], /, *, _may_syncify: bool = False
 ) -> JsOnceCallable:
@@ -1277,8 +1265,7 @@ def to_js(
         ]
         | None
     ) = None,
-) -> JsArray[Any]:
-    ...
+) -> JsArray[Any]: ...
 
 
 @overload
@@ -1296,8 +1283,7 @@ def to_js(
         ]
         | None
     ) = None,
-) -> JsMap[Any, Any]:
-    ...
+) -> JsMap[Any, Any]: ...
 
 
 @overload
@@ -1315,8 +1301,7 @@ def to_js(
         ]
         | None
     ) = None,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 def to_js(
@@ -1496,7 +1481,29 @@ def destroy_proxies(pyproxies: JsArray[Any], /) -> None:
 
 
 def run_sync(x: Awaitable[T]) -> T:
-    """Hi!"""
+    """Block until an awaitable is resolved.
+
+    Only works if JS Promise integration is enabled in the runtime and the
+    current Python call stack was entered via :js:func:`pyodide.runPythonAsync`,
+    by calling an async Python function, or via
+    :js:func:`~pyodide.ffi.PyCallable.callPromising`.
+
+    .. admonition:: Experimental
+        :class: warning
+
+        This feature is not yet stable.
+    """
+    raise NotImplementedError
+
+
+def can_run_sync() -> bool:
+    """Returns ``True`` if :py:func:`run_sync` is available and ``False`` if not.
+
+    .. admonition:: Experimental
+        :class: warning
+
+        This feature is not yet stable.
+    """
     raise NotImplementedError
 
 
@@ -1525,6 +1532,7 @@ __all__ = [
     "JsCallable",
     "JsTypedArray",
     "run_sync",
+    "can_run_sync",
     "create_once_callable",
     "create_proxy",
     "destroy_proxies",

pyodide_py-0.26.2/_pyodide/_future_helper.py

@@ -0,0 +1,14 @@
+def set_result(fut, val):
+    if fut.done():
+        return
+    fut.set_result(val)
+
+
+def set_exception(fut, val):
+    if fut.done():
+        return
+    fut.set_exception(val)
+
+
+def get_future_resolvers(fut):
+    return (set_result.__get__(fut), set_exception.__get__(fut))

pyodide_py-0.26.2/_pyodide/jsbind.py

@@ -0,0 +1,228 @@
+from inspect import Parameter, isclass, iscoroutinefunction, signature
+from types import GenericAlias
+from typing import (  # type:ignore[attr-defined]
+    Any,
+    _AnnotatedAlias,
+    _GenericAlias,
+    _UnionGenericAlias,
+    get_type_hints,
+)
+
+from _pyodide_core import (
+    Js2PyConverter,
+    JsFuncSignature,
+    Py2JsConverter,
+    create_promise_converter,
+    js2py_deep,
+    js2py_default,
+    js2py_default_call_result,
+    py2js_as_json_adaptor,
+    py2js_deep,
+    py2js_default,
+)
+
+
+class Py2JsConverterMeta(type):
+    def __new__(metaclass, name, bases, namespace):
+        result = namespace.get("converter", py2js_default).copy()
+        pc1 = namespace["pre_convert"]
+        pc2 = getattr(result, "pre_convert", None)
+        if pc1 and pc2:
+
+            def pcfinal(o):
+                return pc2(pc1(o))
+        else:
+            pcfinal = pc1 or pc2  # type:ignore[assignment]
+        result.pre_convert = pcfinal
+        return result
+
+
+class Js2PyConverterMeta(type):
+    def __new__(metaclass, name, bases, namespace):
+        result = namespace.get("converter", js2py_default).copy()
+        pc1 = namespace["post_convert"]
+        pc2 = getattr(result, "post_convert", None)
+        if pc1 and pc2:
+
+            def pcfinal(o):
+                return pc1(pc2(o))
+        else:
+            pcfinal = pc1 or pc2  # type:ignore[assignment]
+        result.post_convert = pcfinal
+        return result
+
+
+def js2py_bind(x):
+    class Converter(metaclass=Js2PyConverterMeta):
+        @staticmethod
+        def post_convert(obj):
+            return obj.bind_sig(x)
+
+    return Converter
+
+
+class Json:
+    py2js = py2js_as_json_adaptor
+
+
+class Deep:
+    js2py = js2py_deep
+    py2js = py2js_deep
+
+
+class Default:
+    pass
+
+
+class BindClass:
+    pass
+
+
+class TypeConverter:
+    def unpack_generic_alias(self, x: _GenericAlias) -> Any:
+        if isinstance(x, _UnionGenericAlias):
+            if len(x.__args__) != 2:
+                return None
+            e0 = x.__args__[0]
+            e1 = x.__args__[1]
+            e0isNone = e0 == type(None)
+            e1isNone = e1 == type(None)
+            if (not e0isNone) and (not e1isNone):
+                return None
+            if e0isNone:
+                x = e1
+            if e1isNone:
+                x = e0
+        if isinstance(x, GenericAlias) and x.__name__ in ["Future", "Awaitable"]:
+            arg = x.__args__[0]
+            return create_promise_converter(self.js2py_annotation(arg))
+        if isinstance(x, _AnnotatedAlias):
+            return x.__metadata__[0]
+        return None
+
+    def js2py_annotation(self, annotation: Any) -> "Js2PyConverter":
+        if isinstance(annotation, (_GenericAlias, GenericAlias)):  # noqa: UP038
+            annotation = self.unpack_generic_alias(annotation)
+        if annotation is None:
+            return None
+        if isinstance(annotation, Js2PyConverter):
+            return annotation
+        res = getattr(annotation, "js2py", None)
+        if res:
+            return res
+
+        if issubclass(annotation, BindClass):
+            return js2py_bind(annotation)
+        return None
+
+    def py2js_annotation(self, annotation: Any) -> "Py2JsConverter":
+        if isinstance(annotation, _GenericAlias):
+            annotation = self.unpack_generic_alias(annotation)
+        if annotation is None:
+            return None
+        if isinstance(annotation, Py2JsConverter):
+            return annotation
+        res = getattr(annotation, "py2js", None)
+        if res:
+            return res
+
+        return None
+
+
+type_converter = TypeConverter()
+
+
+def func_to_sig(f):
+    res = getattr(f, "_js_sig", None)
+    if res:
+        return res
+    res = func_to_sig_inner(f)
+    f._js_sig = res
+    return res
+
+
+def get_attr_sig(sig, attr):
+    if not hasattr(sig, "_type_hints"):
+        sig._type_hints = get_type_hints(sig, include_extras=True)
+    attr_sig = sig._type_hints.get(attr, None)
+    if not attr_sig:
+        return (False, getattr(sig, attr, None))
+    if isinstance(attr_sig, BindClass):
+        return (False, attr_sig)
+    converter = type_converter.js2py_annotation(attr_sig)
+    if converter:
+        return (True, converter)
+    return (False, None)
+
+
+no_default = Parameter.empty
+
+
+def func_to_sig_inner(f):
+    sig = signature(f)
+    posparams = []
+    posparams_defaults = []
+    posparams_nmandatory = 0
+    varpos = None
+    kwparam_names = []
+    kwparam_converters = []
+    kwparam_defaults = []
+    varkwd = None
+    types = get_type_hints(f, include_extras=True)
+
+    for p in sig.parameters.values():
+        converter = (
+            type_converter.py2js_annotation(types.get(p.name, None)) or py2js_default
+        )
+        match p.kind:
+            case Parameter.POSITIONAL_ONLY:
+                posparams.append(converter)
+                if p.default == Parameter.empty:
+                    posparams_nmandatory += 1
+                else:
+                    posparams_defaults.append(p.default)
+            case Parameter.POSITIONAL_OR_KEYWORD:
+                raise RuntimeError("Don't currently handle POS_OR_KWD args")
+            case Parameter.KEYWORD_ONLY:
+                kwparam_names.append(p.name)
+                kwparam_converters.append(converter)
+                kwparam_defaults.append(p.default)
+            case Parameter.VAR_POSITIONAL:
+                varpos = converter
+            case Parameter.VAR_KEYWORD:
+                varkwd = converter
+            case _:
+                raise RuntimeError("Unreachable")
+    if len(kwparam_names) > 64:
+        # We use a bitflag to check which kwparams have been passed to fill in
+        # defaults / raise type error.
+        raise RuntimeError("Cannot handle function with more than 64 kwonly args")
+    result = type_converter.js2py_annotation(types.get("return", None))
+    if iscoroutinefunction(f):
+        if result is None:
+            result = js2py_default
+        result = create_promise_converter(result)
+    elif result is None:
+        result = js2py_default_call_result
+
+    should_construct = isclass(f)
+    return JsFuncSignature(
+        f,
+        should_construct,
+        posparams_nmandatory,
+        tuple(posparams),
+        tuple(posparams_defaults),
+        varpos,
+        tuple(kwparam_names),
+        tuple(kwparam_converters),
+        tuple(kwparam_defaults),
+        varkwd,
+        result,
+    )
+
+
+def _default_sig_stencil(*args, **kwargs):
+    pass
+
+
+default_signature = func_to_sig_inner(_default_sig_stencil)

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/pyodide/__init__.py

@@ -10,7 +10,7 @@
 # This package is imported by the test suite as well, and currently we don't use
 # pytest mocks for js or pyodide_js, so make sure to test "if IN_BROWSER" before
 # importing from these.
-__version__ = "0.26.0.dev0"
+__version__ = "0.26.2"
 
 __all__ = ["__version__", "console", "code", "ffi", "http", "webloop"]
 

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/pyodide/console.py

@@ -92,11 +92,15 @@ class _Compile(Compile):
         return_mode: ReturnMode = "last_expr",
         quiet_trailing_semicolon: bool = True,
         flags: int = 0x0,
+        dont_inherit: bool = False,
+        optimize: int = -1,
     ) -> None:
         super().__init__()
         self.flags |= flags
         self.return_mode = return_mode
         self.quiet_trailing_semicolon = quiet_trailing_semicolon
+        self.dont_inherit = dont_inherit
+        self.optimize = optimize
 
     def __call__(  # type: ignore[override]
         self, source: str, filename: str, symbol: str, *, incomplete_input: bool = True
@@ -119,6 +123,8 @@ class _Compile(Compile):
             filename=filename,
             return_mode=return_mode,
             flags=self.flags,
+            dont_inherit=self.dont_inherit,
+            optimize=self.optimize,
         ).compile()
         assert code_runner.code
         for feature in _features:
@@ -146,11 +152,15 @@ class _CommandCompiler(CommandCompiler):
         return_mode: ReturnMode = "last_expr",
         quiet_trailing_semicolon: bool = True,
         flags: int = 0x0,
+        dont_inherit: bool = False,
+        optimize: int = -1,
     ) -> None:
         self.compiler = _Compile(
             return_mode=return_mode,
             quiet_trailing_semicolon=quiet_trailing_semicolon,
             flags=flags,
+            dont_inherit=dont_inherit,
+            optimize=optimize,
         )
 
     def __call__(  # type: ignore[override]
@@ -237,6 +247,16 @@ class Console:
     filename :
 
         The file name to report in error messages. Defaults to ``"<console>"``.
+
+    dont_inherit :
+
+        Whether to inherit ``__future__`` imports from the outer code.
+        See the documentation for the built-in :external:py:func:`compile` function.
+
+    optimize :
+
+        Specifies the optimization level of the compiler. See the documentation
+        for the built-in :external:py:func:`compile` function.
     """
 
     globals: dict[str, Any]
@@ -270,6 +290,8 @@ class Console:
         stderr_callback: Callable[[str], None] | None = None,
         persistent_stream_redirection: bool = False,
         filename: str = "<console>",
+        dont_inherit: bool = False,
+        optimize: int = -1,
     ) -> None:
         if globals is None:
             globals = {"__name__": "__console__", "__doc__": None}
@@ -283,9 +305,9 @@ class Console:
         self.buffer = []
         self._lock = asyncio.Lock()
         self._streams_redirected = False
-        self._stream_generator: Generator[
-            None, None, None
-        ] | None = None  # track persistent stream redirection
+        self._stream_generator: Generator[None, None, None] | None = (
+            None  # track persistent stream redirection
+        )
         if persistent_stream_redirection:
             self.persistent_redirect_streams()
         self._completer = rlcompleter.Completer(self.globals)
@@ -294,7 +316,11 @@ class Console:
         self.completer_word_break_characters = (
             """ \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?"""
         )
-        self._compile = _CommandCompiler(flags=ast.PyCF_ALLOW_TOP_LEVEL_AWAIT)
+        self._compile = _CommandCompiler(
+            flags=ast.PyCF_ALLOW_TOP_LEVEL_AWAIT,
+            dont_inherit=dont_inherit,
+            optimize=optimize,
+        )
 
     def persistent_redirect_streams(self) -> None:
         """Redirect :py:data:`~sys.stdin`/:py:data:`~sys.stdout`/:py:data:`~sys.stdout` persistently"""
@@ -379,18 +405,21 @@ class Console:
                 res.set_result(fut.result())
             res = None
 
-        ensure_future(self.runcode(source, code)).add_done_callback(done_cb)
+        ensure_future(self._runcode_with_lock(source, code)).add_done_callback(done_cb)
         return res
 
+    async def _runcode_with_lock(self, source: str, code: CodeRunner) -> Any:
+        async with self._lock:
+            return await self.runcode(source, code)
+
     async def runcode(self, source: str, code: CodeRunner) -> Any:
         """Execute a code object and return the result."""
-        async with self._lock:
-            with self.redirect_streams():
-                try:
-                    return await code.run_async(self.globals)
-                finally:
-                    sys.stdout.flush()
-                    sys.stderr.flush()
+        with self.redirect_streams():
+            try:
+                return await code.run_async(self.globals)
+            finally:
+                sys.stdout.flush()
+                sys.stderr.flush()
 
     def formatsyntaxerror(self, e: Exception) -> str:
         """Format the syntax error that just occurred.
@@ -409,7 +438,7 @@ class Console:
         kept_frames = 0
         # Try to trim out stack frames inside our code
         for frame, _ in traceback.walk_tb(tb):
-            keep_frames = keep_frames or frame.f_code.co_filename == "<console>"
+            keep_frames = keep_frames or frame.f_code.co_filename == self.filename
             keep_frames = keep_frames or frame.f_code.co_filename == "<exec>"
             if keep_frames:
                 kept_frames += 1

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/pyodide/ffi/__init__.py

@@ -21,6 +21,7 @@ if IN_BROWSER:
     for t in [
         "JsException",
         "run_sync",
+        "can_run_sync",
         "create_once_callable",
         "create_proxy",
         "destroy_proxies",
@@ -54,6 +55,7 @@ __all__ = [
     "create_proxy",
     "destroy_proxies",
     "to_js",
+    "run_sync",
     "IN_BROWSER",
     "register_js_module",
     "unregister_js_module",

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/pyodide/webloop.py

@@ -8,7 +8,7 @@ from asyncio import Future, Task
 from collections.abc import Awaitable, Callable
 from typing import Any, TypeVar, overload
 
-from .ffi import IN_BROWSER, create_once_callable
+from .ffi import IN_BROWSER, create_once_callable, run_sync
 
 if IN_BROWSER:
     from pyodide_js._api import scheduleCallback
@@ -30,32 +30,28 @@ class PyodideFuture(Future[T]):
         self,
         onfulfilled: None,
         onrejected: Callable[[BaseException], Awaitable[S]],
-    ) -> "PyodideFuture[S]":
-        ...
+    ) -> "PyodideFuture[S]": ...
 
     @overload
     def then(
         self,
         onfulfilled: None,
         onrejected: Callable[[BaseException], S],
-    ) -> "PyodideFuture[S]":
-        ...
+    ) -> "PyodideFuture[S]": ...
 
     @overload
     def then(
         self,
         onfulfilled: Callable[[T], Awaitable[S]],
         onrejected: Callable[[BaseException], Awaitable[S]] | None = None,
-    ) -> "PyodideFuture[S]":
-        ...
+    ) -> "PyodideFuture[S]": ...
 
     @overload
     def then(
         self,
         onfulfilled: Callable[[T], S],
         onrejected: Callable[[BaseException], S] | None = None,
-    ) -> "PyodideFuture[S]":
-        ...
+    ) -> "PyodideFuture[S]": ...
 
     def then(
         self,
@@ -128,12 +124,10 @@ class PyodideFuture(Future[T]):
     @overload
     def catch(
         self, onrejected: Callable[[BaseException], Awaitable[S]]
-    ) -> "PyodideFuture[S]":
-        ...
+    ) -> "PyodideFuture[S]": ...
 
     @overload
-    def catch(self, onrejected: Callable[[BaseException], S]) -> "PyodideFuture[S]":
-        ...
+    def catch(self, onrejected: Callable[[BaseException], S]) -> "PyodideFuture[S]": ...
 
     def catch(
         self, onrejected: Callable[[BaseException], object]
@@ -265,6 +259,10 @@ class WebLoop(asyncio.AbstractEventLoop):
             do_something_with_result(result)
         ```
         """
+        from pyodide_js._api import config
+
+        if config.enableRunUntilComplete:
+            return run_sync(future)
         return asyncio.ensure_future(future)
 
     #
@@ -274,7 +272,7 @@ class WebLoop(asyncio.AbstractEventLoop):
     def call_soon(
         self,
         callback: Callable[..., Any],
-        *args: Any,
+        *args: Any,  # type: ignore[override]
         context: contextvars.Context | None = None,
     ) -> asyncio.Handle:
         """Arrange for a callback to be called as soon as possible.
@@ -290,7 +288,7 @@ class WebLoop(asyncio.AbstractEventLoop):
     def call_soon_threadsafe(
         self,
         callback: Callable[..., Any],
-        *args: Any,
+        *args: Any,  # type: ignore[override]
         context: contextvars.Context | None = None,
     ) -> asyncio.Handle:
         """Like ``call_soon()``, but thread-safe.

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/pyodide_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyodide-py
-Version: 0.26.0.dev0
+Version: 0.26.2
 Summary: A Python package providing core interpreter functionality for Pyodide
 Author: Pyodide developers
 Project-URL: Homepage, https://github.com/pyodide/pyodide

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/pyodide_py.egg-info/SOURCES.txt

@@ -5,9 +5,11 @@ setup.py
 ./_pyodide/__init__.py
 ./_pyodide/_base.py
 ./_pyodide/_core_docs.py
+./_pyodide/_future_helper.py
 ./_pyodide/_importhook.py
 ./_pyodide/docs_argspec.py
 ./_pyodide/docstring.py
+./_pyodide/jsbind.py
 ./_pyodide/py.typed
 ./pyodide/__init__.py
 ./pyodide/_core.py

{pyodide-py-0.26.0.dev0 → pyodide_py-0.26.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyodide-py"
-version = "0.26.0.dev0"
+version = "0.26.2"
 authors = [{name = "Pyodide developers"}]
 description = "A Python package providing core interpreter functionality for Pyodide"
 classifiers = [