mirror of
https://github.com/RustPython/RustPython.git
synced 2026-10-29 03:04:38 +08:00
* Preserve original main VM through C API execution
Run and finalize the original main VM while keeping the registered attachment template available without holding its mutex across Python callbacks.
Assisted-by: OpenAI Codex:model version unavailable
* Make unraisable reporting robust at hook boundaries
Keep the existing message API and traceback formatting while handling missing, disabled, audited and failing hooks without panicking.
Assisted-by: OpenAI Codex:model version unavailable
* Separate interactive warning collection from compilation
Retain ordinary warning behavior and typed module APIs while exposing record-local parser warnings and post-warning code generation. Add a source-only lazy future-import guard.
Assisted-by: OpenAI Codex:model version unavailable
* Evaluate native stdin with shared VM record semantics
Use one evaluator for basic REPL and root transports, preserve effective inspect snapshots and future flags, and carry owned host exit status through original-main finalization.
Assisted-by: OpenAI Codex:model version unavailable
* Refresh canonical REPL tests and retire fixed failures
Run update_lib migrate from pinned CPython 3.15.0, preserving three remaining platform/runtime markers and retiring the two traceback/startup failures verified on the native evaluator.
Assisted-by: OpenAI Codex:model version unavailable
* Keep the root compiler dependency for development targets
The native evaluator now compiles through the VM. Only root benchmarks and the parse_folder example use rustpython-compiler directly, so declare it as a dev dependency while preserving VM compiler features.
Assisted-by: OpenAI Codex:model version unavailable
* Validate explicit conditional failure marker retirement
Require exact selector and original decorator evidence for each conditional expected-failure marker retired by migrate. Preserve undeclared guards and reject missing, duplicate, modified or unconsumed declarations.
Assisted-by: OpenAI Codex:model version unavailable
* Refresh canonical stdin and exception audit tests
Migrate the pinned CPython 3.15.0 modules and their canonical helper fixtures through update_lib. Retire exactly four failure markers proven obsolete by hosted CI, preserving all other existing guards.
Assisted-by: OpenAI Codex:model version unavailable
* Synchronize runpy warning attribution and document remaining capabilities
Migrate whole canonical runpy.py to pass module names to compile. Use update_lib to annotate only reproduced missing-capability cases: absent _testcapi import-event tests, unsupported startup/import-time features, and the deferred frozen-loader module-attribution caller.
Assisted-by: OpenAI Codex:model version unavailable
* Propagate interrupted native stdin reads to signal dispatch
Preserve the shared input buffer and partial bytes while returning EINTR to the VM before retrying. Exercise the transport deterministically and verify a returning SIGINT handler while pipe stdin stays open.
Assisted-by: OpenAI Codex:model version unavailable
* Reject statements after a compound statement in single mode
single_mode_multiple_statements_error now reports "invalid syntax" at the
statement that follows a compound first statement, and interactive_input
runs it right after parsing as compile() does.
The lazy `from __future__` import check moved from lazy_future_import_error
into unsupported_grammar_error, so it applies to every compile mode.
Assisted-by: Claude Code:claude-opus-5-5
* Remove passing expected failure from test_runpy
test_run_module_filter_syntax_warnings_by_module passes.
Assisted-by: Claude Code:claude-opus-5-5
* Restructure stdin execution after Modules/main.c and pythonrun.c
- src/lib.rs follows pymain_run_python: pymain_run_stdin, pymain_repl,
pymain_run_startup, pymain_run_interactive_hook and pymain_run_pyrepl
return exit codes instead of raising SystemExit.
- VirtualMachine gains run_any_stdin (_PyRun_AnyFile),
run_interactive_loop (_PyRun_InteractiveLoop) and run_simple_stdin;
run_shell feeds rustyline lines into run_interactive_loop, and
sys._baserepl calls run_any_stdin.
- print_uncaught_exception (PyErr_Print) replaces
report_uncaught_exception, and handle_system_exit_and_keyboard_interrupt
replaces handle_reported_exception.
- An unhandled KeyboardInterrupt is recorded and the process exits
through SIGINT after finalization.
- Interpreter::run_main replaces run_with_exit_status and InterpreterExit;
rustpython_capi::run_main_interpreter takes an exit-code callback.
- config_set_inspect audits cpython.PyConfig_Set and rebuilds sys.flags
through set_flag_obj (_PySys_SetFlagObj); the inspect state is an
AtomicBool and dict replace_by_identity is removed.
- add_main_module (PyImport_AddModuleRef("__main__")) is used by the
interactive and simple-file paths.
- The interactive parser warning helpers take their state directly.
Assisted-by: Claude Code:claude-opus-5-5
* Exit through Py_Exit from PyErr_Print and run the basic REPL via stdin
- print_uncaught_exception (PyErr_Print) calls exit_process (Py_Exit) for a
SystemExit when inspect mode is off, instead of returning the exception.
run_interactive_loop no longer checks SystemExit itself and flushes after
printing an error; sys._baserepl returns None.
- exit_process finalizes through VirtualMachine::finalize_ex, which holds
the Py_FinalizeEx steps split out of Interpreter::finalize, and exits
through host_env::os::exit_with_cleanup (C exit()).
- The basic REPL on a terminal (PYTHON_BASIC_REPL, or _pyrepl missing)
runs run_any_stdin instead of the rustyline shell.
- run_shell saves the history after every line.
Assisted-by: Claude Code:claude-opus-5-5
* Display exceptions through PyErr_Display and track the main thread running __main__
- display_exception (PyErr_Display) and display_exception_to (_PyErr_Display)
try traceback._print_exception_bltin before the native printer and flush
the file. PyErr_Print's excepthook fallback, print_exception and
sys.excepthook use them. A missing sys.stderr is reported with
dump_object (PyObject_Dump); a None sys.stderr prints nothing.
- Paths gains program_name (argv[0]) from getpath. The "can't open file"
message uses it with strerror(errno) and goes to sys.stderr.
- running_main holds the ident of the thread running __main__.
pymain_run_python sets it around running the main code, Py_Exit clears it,
the fork child reinitializes it, and _interpreters.is_running reads it
instead of treating the main interpreter as always running.
- Interpreter::run_main clears the unhandled KeyboardInterrupt flag before
running and applies exit_sigint after finalizing; finalize no longer
does.
- run_interactive_loop returns a SystemExit raised outside inspect mode
again and no longer flushes after printing an error; run_shell saves the
history once after the loop.
- pymain_set_inspect reports its error through print_uncaught_exception.
Assisted-by: Claude Code:claude-opus-5-5
* Treat a parse error at the end of the source as incomplete input
A parser error that starts at the end of the source is reported as
_IncompleteInputError when incomplete input is allowed, so the
interactive loop and codeop keep reading after `try:` and its block or
after a decorator line.
Assisted-by: Claude Code:claude-opus-5-5
* Place syntax errors on tokens made up at the end of the input
A parse error on the NEWLINE, DEDENT or ENDMARKER the tokenizer makes up
at the end of the input now carries an EofToken: the number of lines
read and the last line. SyntaxError takes its lineno and text from it,
and its offset is that line's length with end_offset -1, or 0 for both
when the error is raised at the token itself (the generic syntax error
and a missing forced `:` or `(`). Exec input that does not end with a
newline is checked with one appended.
Assisted-by: Claude Code:claude-opus-5-5
* Slice the source with get when checking an indented block error at EOF
Assisted-by: Claude Code:claude-opus-5-5
* Rename the host exits after C exit() and fix wasi and Windows builds
- host_env::os::exit now calls the C exit() on every platform; on Windows
std::process::exit ends in ExitProcess, so it flushes the Rust stdout
and calls libc::exit there. The former exit, which calls _exit(), is
now exit_immediately, used by os._exit, faulthandler and
posixsubprocess.
- errno::strerror_string is available on wasi.
- PyGlobalState::reinit_running_main is built only where its fork caller
is.
Assisted-by: Claude Code:claude-opus-5-5
---------
Co-authored-by: Jeong YunWon <jeong@youknowone.org>
325 lines
13 KiB
Python
Vendored
325 lines
13 KiB
Python
Vendored
"""runpy.py - locating and running Python code using the module namespace
|
||
|
||
Provides support for locating and running Python scripts using the Python
|
||
module namespace instead of the native filesystem.
|
||
|
||
This allows Python code to play nicely with non-filesystem based PEP 302
|
||
importers when locating support scripts as well as when importing modules.
|
||
"""
|
||
# Written by Nick Coghlan <ncoghlan at gmail.com>
|
||
# to implement PEP 338 (Executing Modules as Scripts)
|
||
|
||
|
||
import sys
|
||
import importlib.machinery # importlib first so we can test #15386 via -m
|
||
import importlib.util
|
||
import io
|
||
import os
|
||
|
||
__all__ = [
|
||
"run_module", "run_path",
|
||
]
|
||
|
||
# avoid 'import types' just for ModuleType
|
||
ModuleType = type(sys)
|
||
|
||
class _TempModule(object):
|
||
"""Temporarily replace a module in sys.modules with an empty namespace"""
|
||
def __init__(self, mod_name):
|
||
self.mod_name = mod_name
|
||
self.module = ModuleType(mod_name)
|
||
self._saved_module = []
|
||
|
||
def __enter__(self):
|
||
mod_name = self.mod_name
|
||
try:
|
||
self._saved_module.append(sys.modules[mod_name])
|
||
except KeyError:
|
||
pass
|
||
sys.modules[mod_name] = self.module
|
||
return self
|
||
|
||
def __exit__(self, *args):
|
||
if self._saved_module:
|
||
sys.modules[self.mod_name] = self._saved_module[0]
|
||
else:
|
||
del sys.modules[self.mod_name]
|
||
self._saved_module = []
|
||
|
||
class _ModifiedArgv0(object):
|
||
def __init__(self, value):
|
||
self.value = value
|
||
self._saved_value = self._sentinel = object()
|
||
|
||
def __enter__(self):
|
||
if self._saved_value is not self._sentinel:
|
||
raise RuntimeError("Already preserving saved value")
|
||
self._saved_value = sys.argv[0]
|
||
sys.argv[0] = self.value
|
||
|
||
def __exit__(self, *args):
|
||
self.value = self._sentinel
|
||
sys.argv[0] = self._saved_value
|
||
|
||
# TODO: Replace these helpers with importlib._bootstrap_external functions.
|
||
def _run_code(code, run_globals, init_globals=None,
|
||
mod_name=None, mod_spec=None,
|
||
pkg_name=None, script_name=None):
|
||
"""Helper to run code in nominated namespace"""
|
||
if init_globals is not None:
|
||
run_globals.update(init_globals)
|
||
if mod_spec is None:
|
||
loader = None
|
||
fname = script_name
|
||
cached = None
|
||
else:
|
||
loader = mod_spec.loader
|
||
fname = mod_spec.origin
|
||
cached = mod_spec.cached
|
||
if pkg_name is None:
|
||
pkg_name = mod_spec.parent
|
||
run_globals.update(__name__ = mod_name,
|
||
__file__ = fname,
|
||
__doc__ = None,
|
||
__loader__ = loader,
|
||
__package__ = pkg_name,
|
||
__spec__ = mod_spec)
|
||
exec(code, run_globals)
|
||
return run_globals
|
||
|
||
def _run_module_code(code, init_globals=None,
|
||
mod_name=None, mod_spec=None,
|
||
pkg_name=None, script_name=None):
|
||
"""Helper to run code in new namespace with sys modified"""
|
||
fname = script_name if mod_spec is None else mod_spec.origin
|
||
with _TempModule(mod_name) as temp_module, _ModifiedArgv0(fname):
|
||
mod_globals = temp_module.module.__dict__
|
||
_run_code(code, mod_globals, init_globals,
|
||
mod_name, mod_spec, pkg_name, script_name)
|
||
# Copy the globals of the temporary module, as they
|
||
# may be cleared when the temporary module goes away
|
||
return mod_globals.copy()
|
||
|
||
# Helper to get the full name, spec and code for a module
|
||
def _get_module_details(mod_name, error=ImportError):
|
||
# name= is only accepted by ImportError and its subclasses.
|
||
kwargs = {"name": mod_name} if issubclass(error, ImportError) else {}
|
||
if mod_name.startswith("."):
|
||
raise error("Relative module names not supported", **kwargs)
|
||
pkg_name, _, _ = mod_name.rpartition(".")
|
||
if pkg_name:
|
||
# Try importing the parent to avoid catching initialization errors
|
||
try:
|
||
__import__(pkg_name)
|
||
except ImportError as e:
|
||
# If the parent or higher ancestor package is missing, let the
|
||
# error be raised by find_spec() below and then be caught. But do
|
||
# not allow other errors to be caught.
|
||
if e.name is None or (e.name != pkg_name and
|
||
not pkg_name.startswith(e.name + ".")):
|
||
raise
|
||
# Warn if the module has already been imported under its normal name
|
||
existing = sys.modules.get(mod_name)
|
||
if existing is not None and not hasattr(existing, "__path__"):
|
||
from warnings import warn
|
||
msg = "{mod_name!r} found in sys.modules after import of " \
|
||
"package {pkg_name!r}, but prior to execution of " \
|
||
"{mod_name!r}; this may result in unpredictable " \
|
||
"behaviour".format(mod_name=mod_name, pkg_name=pkg_name)
|
||
warn(RuntimeWarning(msg))
|
||
|
||
try:
|
||
spec = importlib.util.find_spec(mod_name)
|
||
except (ImportError, AttributeError, TypeError, ValueError) as ex:
|
||
# This hack fixes an impedance mismatch between pkgutil and
|
||
# importlib, where the latter raises other errors for cases where
|
||
# pkgutil previously raised ImportError
|
||
msg = "Error while finding module specification for {!r} ({}: {})"
|
||
if mod_name.endswith(".py"):
|
||
msg += (f". Try using '{mod_name[:-3]}' instead of "
|
||
f"'{mod_name}' as the module name.")
|
||
raise error(msg.format(mod_name, type(ex).__name__, ex),
|
||
**kwargs) from ex
|
||
if spec is None:
|
||
raise error("No module named %s" % mod_name, **kwargs)
|
||
if spec.submodule_search_locations is not None:
|
||
if mod_name == "__main__" or mod_name.endswith(".__main__"):
|
||
raise error("Cannot use package as __main__ module", **kwargs)
|
||
try:
|
||
pkg_main_name = mod_name + ".__main__"
|
||
return _get_module_details(pkg_main_name, error)
|
||
except error as e:
|
||
if mod_name not in sys.modules:
|
||
raise # No module loaded; being a package is irrelevant
|
||
raise error(("%s; %r is a package and cannot " +
|
||
"be directly executed") %(e, mod_name),
|
||
**kwargs)
|
||
loader = spec.loader
|
||
if loader is None:
|
||
raise error("%r is a namespace package and cannot be executed"
|
||
% mod_name,
|
||
**kwargs)
|
||
try:
|
||
code = loader.get_code(mod_name)
|
||
except ImportError as e:
|
||
raise error(format(e), **kwargs) from e
|
||
if code is None:
|
||
raise error("No code object available for %s" % mod_name, **kwargs)
|
||
return mod_name, spec, code
|
||
|
||
class _Error(Exception):
|
||
"""Error that _run_module_as_main() should report without a traceback"""
|
||
|
||
# XXX ncoghlan: Should this be documented and made public?
|
||
# (Current thoughts: don't repeat the mistake that lead to its
|
||
# creation when run_module() no longer met the needs of
|
||
# mainmodule.c, but couldn't be changed because it was public)
|
||
def _run_module_as_main(mod_name, alter_argv=True):
|
||
"""Runs the designated module in the __main__ namespace
|
||
|
||
Note that the executed module will have full access to the
|
||
__main__ namespace. If this is not desirable, the run_module()
|
||
function should be used to run the module code in a fresh namespace.
|
||
|
||
At the very least, these variables in __main__ will be overwritten:
|
||
__name__
|
||
__file__
|
||
__loader__
|
||
__package__
|
||
"""
|
||
try:
|
||
if alter_argv or mod_name != "__main__": # i.e. -m switch
|
||
mod_name, mod_spec, code = _get_module_details(mod_name, _Error)
|
||
else: # i.e. directory or zipfile execution
|
||
mod_name, mod_spec, code = _get_main_module_details(_Error)
|
||
except _Error as exc:
|
||
msg = "%s: %s" % (sys.executable, exc)
|
||
sys.exit(msg)
|
||
main_globals = sys.modules["__main__"].__dict__
|
||
if alter_argv:
|
||
sys.argv[0] = mod_spec.origin
|
||
return _run_code(code, main_globals, None,
|
||
"__main__", mod_spec)
|
||
|
||
def run_module(mod_name, init_globals=None,
|
||
run_name=None, alter_sys=False):
|
||
"""Execute a module's code without importing it.
|
||
|
||
mod_name -- an absolute module name or package name.
|
||
|
||
Optional arguments:
|
||
init_globals -- dictionary used to pre-populate the module’s
|
||
globals dictionary before the code is executed.
|
||
|
||
run_name -- if not None, this will be used for setting __name__;
|
||
otherwise, __name__ will be set to mod_name + '__main__' if the
|
||
named module is a package and to just mod_name otherwise.
|
||
|
||
alter_sys -- if True, sys.argv[0] is updated with the value of
|
||
__file__ and sys.modules[__name__] is updated with a temporary
|
||
module object for the module being executed. Both are
|
||
restored to their original values before the function returns.
|
||
|
||
Returns the resulting module globals dictionary.
|
||
"""
|
||
mod_name, mod_spec, code = _get_module_details(mod_name)
|
||
if run_name is None:
|
||
run_name = mod_name
|
||
if alter_sys:
|
||
return _run_module_code(code, init_globals, run_name, mod_spec)
|
||
else:
|
||
# Leave the sys module alone
|
||
return _run_code(code, {}, init_globals, run_name, mod_spec)
|
||
|
||
def _get_main_module_details(error=ImportError):
|
||
# Helper that gives a nicer error message when attempting to
|
||
# execute a zipfile or directory by invoking __main__.py
|
||
# Also moves the standard __main__ out of the way so that the
|
||
# preexisting __loader__ entry doesn't cause issues
|
||
main_name = "__main__"
|
||
kwargs = {"name": main_name} if issubclass(error, ImportError) else {}
|
||
saved_main = sys.modules[main_name]
|
||
del sys.modules[main_name]
|
||
try:
|
||
return _get_module_details(main_name)
|
||
except ImportError as exc:
|
||
if main_name in str(exc):
|
||
raise error("can't find %r module in %r" %
|
||
(main_name, sys.path[0]),
|
||
**kwargs) from exc
|
||
raise
|
||
finally:
|
||
sys.modules[main_name] = saved_main
|
||
|
||
|
||
def _get_code_from_file(fname, module):
|
||
# Check for a compiled file first
|
||
from pkgutil import read_code
|
||
code_path = os.path.abspath(fname)
|
||
with io.open_code(code_path) as f:
|
||
code = read_code(f)
|
||
if code is None:
|
||
# That didn't work, so try it as normal source code
|
||
with io.open_code(code_path) as f:
|
||
code = compile(f.read(), fname, 'exec', module=module)
|
||
return code
|
||
|
||
def run_path(path_name, init_globals=None, run_name=None):
|
||
"""Execute code located at the specified filesystem location.
|
||
|
||
path_name -- filesystem location of a Python script, zipfile,
|
||
or directory containing a top level __main__.py script.
|
||
|
||
Optional arguments:
|
||
init_globals -- dictionary used to pre-populate the module’s
|
||
globals dictionary before the code is executed.
|
||
|
||
run_name -- if not None, this will be used to set __name__;
|
||
otherwise, '<run_path>' will be used for __name__.
|
||
|
||
Returns the resulting module globals dictionary.
|
||
"""
|
||
if run_name is None:
|
||
run_name = "<run_path>"
|
||
pkg_name = run_name.rpartition(".")[0]
|
||
from pkgutil import get_importer
|
||
importer = get_importer(path_name)
|
||
path_name = os.fsdecode(path_name)
|
||
if isinstance(importer, type(None)):
|
||
# Not a valid sys.path entry, so run the code directly
|
||
# execfile() doesn't help as we want to allow compiled files
|
||
code = _get_code_from_file(path_name, run_name)
|
||
return _run_module_code(code, init_globals, run_name,
|
||
pkg_name=pkg_name, script_name=path_name)
|
||
else:
|
||
# Finder is defined for path, so add it to
|
||
# the start of sys.path
|
||
sys.path.insert(0, path_name)
|
||
try:
|
||
# Here's where things are a little different from the run_module
|
||
# case. There, we only had to replace the module in sys while the
|
||
# code was running and doing so was somewhat optional. Here, we
|
||
# have no choice and we have to remove it even while we read the
|
||
# code. If we don't do this, a __loader__ attribute in the
|
||
# existing __main__ module may prevent location of the new module.
|
||
mod_name, mod_spec, code = _get_main_module_details()
|
||
with _TempModule(run_name) as temp_module, \
|
||
_ModifiedArgv0(path_name):
|
||
mod_globals = temp_module.module.__dict__
|
||
return _run_code(code, mod_globals, init_globals,
|
||
run_name, mod_spec, pkg_name).copy()
|
||
finally:
|
||
try:
|
||
sys.path.remove(path_name)
|
||
except ValueError:
|
||
pass
|
||
|
||
|
||
if __name__ == "__main__":
|
||
# Run the module specified as the next command line argument
|
||
if len(sys.argv) < 2:
|
||
print("No module specified for execution", file=sys.stderr)
|
||
else:
|
||
del sys.argv[0] # Make the requested module sys.argv[0]
|
||
_run_module_as_main(sys.argv[0])
|