Skip to content

correct builtins type under function #6745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Jan 16, 2026
Merged

correct builtins type under function #6745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d36e414
correct buitins type
youknowone Jan 16, 2026
a9078b4
Auto-format: ruff format
github-actions[bot] Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions crates/vm/src/builtins/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
mod jit;

use super::{
PyAsyncGen, PyCode, PyCoroutine, PyDictRef, PyGenerator, PyStr, PyStrRef, PyTuple, PyTupleRef,
PyType,
PyAsyncGen, PyCode, PyCoroutine, PyDictRef, PyGenerator, PyModule, PyStr, PyStrRef, PyTuple,
PyTupleRef, PyType,
};
#[cfg(feature = "jit")]
use crate::common::lock::OnceCell;
Expand Down Expand Up @@ -67,9 +67,15 @@ impl PyFunction {
if let Some(frame) = vm.current_frame() {
frame.builtins.clone().into()
} else {
vm.builtins.clone().into()
vm.builtins.dict().into()
}
});
// If builtins is a module, use its __dict__ instead
let builtins = if let Some(module) = builtins.downcast_ref::<PyModule>() {
module.dict().into()
} else {
builtins
};

let qualname = vm.ctx.new_str(code.qualname.as_str());
let func = Self {
Expand Down Expand Up @@ -679,19 +685,19 @@ pub struct PyFunctionNewArgs {
#[pyarg(any, optional)]
name: OptionalArg<PyStrRef>,
#[pyarg(any, optional)]
defaults: OptionalArg<PyTupleRef>,
argdefs: Option<PyTupleRef>,
#[pyarg(any, optional)]
closure: OptionalArg<PyTupleRef>,
closure: Option<PyTupleRef>,
#[pyarg(any, optional)]
kwdefaults: OptionalArg<PyDictRef>,
kwdefaults: Option<PyDictRef>,
}

impl Constructor for PyFunction {
type Args = PyFunctionNewArgs;

fn py_new(_cls: &Py<PyType>, args: Self::Args, vm: &VirtualMachine) -> PyResult<Self> {
// Handle closure - must be a tuple of cells
let closure = if let Some(closure_tuple) = args.closure.into_option() {
let closure = if let Some(closure_tuple) = args.closure {
// Check that closure length matches code's free variables
if closure_tuple.len() != args.code.freevars.len() {
return Err(vm.new_value_error(format!(
Expand Down Expand Up @@ -722,10 +728,10 @@ impl Constructor for PyFunction {
if let Some(closure_tuple) = closure {
func.closure = Some(closure_tuple);
}
if let Some(defaults) = args.defaults.into_option() {
func.defaults_and_kwdefaults.lock().0 = Some(defaults);
if let Some(argdefs) = args.argdefs {
func.defaults_and_kwdefaults.lock().0 = Some(argdefs);
}
if let Some(kwdefaults) = args.kwdefaults.into_option() {
if let Some(kwdefaults) = args.kwdefaults {
func.defaults_and_kwdefaults.lock().1 = Some(kwdefaults);
}

Expand Down
11 changes: 11 additions & 0 deletions extra_tests/snippets/builtins_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@
exec("", namespace)
assert namespace["__builtins__"] == __builtins__.__dict__


# function.__builtins__ should be a dict, not a module
# See: https://docs.python.org/3/reference/datamodel.html
def test_func():
pass


assert isinstance(test_func.__builtins__, dict), (
f"function.__builtins__ should be dict, got {type(test_func.__builtins__)}"
)

# with assert_raises(NameError):
# exec('print(__builtins__)', {'__builtins__': {}})

Expand Down
Loading