Skip to content

Pyfunction builtins and constructor #5823

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
merged 2 commits into from
Jun 24, 2025
Merged

Pyfunction builtins and constructor #5823

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
9bbaf5a
func builtins
youknowone Jun 22, 2025
67dbf42
PyFunction constructor
youknowone Jun 22, 2025
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
2 changes: 0 additions & 2 deletions Lib/test/test_collections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,8 +698,6 @@ class NewPoint(tuple):
self.assertEqual(np.x, 1)
self.assertEqual(np.y, 2)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_new_builtins_issue_43102(self):
obj = namedtuple('C', ())
new_func = obj.__new__
Expand Down
117 changes: 109 additions & 8 deletions vm/src/builtins/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use super::{
#[cfg(feature = "jit")]
use crate::common::lock::OnceCell;
use crate::common::lock::PyMutex;
use crate::convert::ToPyObject;
use crate::convert::{ToPyObject, TryFromObject};
use crate::function::ArgMapping;
use crate::object::{Traverse, TraverseFn};
use crate::{
Expand All @@ -31,6 +31,7 @@ use rustpython_jit::CompiledCode;
pub struct PyFunction {
code: PyRef<PyCode>,
globals: PyDictRef,
builtins: PyObjectRef,
closure: Option<PyTupleTyped<PyCellRef>>,
defaults_and_kwdefaults: PyMutex<(Option<PyTupleRef>, Option<PyDictRef>)>,
name: PyMutex<PyStrRef>,
Expand All @@ -53,6 +54,7 @@ unsafe impl Traverse for PyFunction {

impl PyFunction {
#[allow(clippy::too_many_arguments)]
#[inline]
pub(crate) fn new(
code: PyRef<PyCode>,
globals: PyDictRef,
Expand All @@ -62,24 +64,42 @@ impl PyFunction {
qualname: PyStrRef,
type_params: PyTupleRef,
annotations: PyDictRef,
module: PyObjectRef,
doc: PyObjectRef,
) -> Self {
vm: &VirtualMachine,
) -> PyResult<Self> {
let name = PyMutex::new(code.obj_name.to_owned());
PyFunction {
let module = vm.unwrap_or_none(globals.get_item_opt(identifier!(vm, __name__), vm)?);
let builtins = globals.get_item("__builtins__", vm).unwrap_or_else(|_| {
// If not in globals, inherit from current execution context
if let Some(frame) = vm.current_frame() {
frame.builtins.clone().into()
} else {
vm.builtins.clone().into()
}
});

let func = PyFunction {
code,
globals,
builtins,
closure,
defaults_and_kwdefaults: PyMutex::new((defaults, kw_only_defaults)),
name,
qualname: PyMutex::new(qualname),
type_params: PyMutex::new(type_params),
#[cfg(feature = "jit")]
jitted_code: OnceCell::new(),
annotations: PyMutex::new(annotations),
module: PyMutex::new(module),
doc: PyMutex::new(doc),
}
#[cfg(feature = "jit")]
jitted_code: OnceCell::new(),
};

// let name = qualname.as_str().split('.').next_back().unwrap();
// func.set_attr(identifier!(vm, __name__), vm.new_pyobj(name), vm)?;
// func.set_attr(identifier!(vm, __qualname__), qualname, vm)?;
// func.set_attr(identifier!(vm, __doc__), doc, vm)?;
Comment on lines +97 to +100
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check if this is required


Ok(func)
}

fn fill_locals_from_args(
Expand Down Expand Up @@ -362,7 +382,7 @@ impl PyPayload for PyFunction {
}

#[pyclass(
with(GetDescriptor, Callable, Representable),
with(GetDescriptor, Callable, Representable, Constructor),
flags(HAS_DICT, METHOD_DESCRIPTOR)
)]
impl PyFunction {
Expand Down Expand Up @@ -406,6 +426,12 @@ impl PyFunction {
Ok(vm.unwrap_or_none(zelf.closure.clone().map(|x| x.to_pyobject(vm))))
}

#[pymember(magic)]
fn builtins(vm: &VirtualMachine, zelf: PyObjectRef) -> PyResult {
let zelf = Self::_as_pyref(&zelf, vm)?;
Ok(zelf.builtins.clone())
}

#[pygetset(magic)]
fn name(&self) -> PyStrRef {
self.name.lock().clone()
Expand Down Expand Up @@ -555,6 +581,81 @@ impl Representable for PyFunction {
}
}

#[derive(FromArgs)]
pub struct PyFunctionNewArgs {
#[pyarg(positional)]
code: PyRef<PyCode>,
#[pyarg(positional)]
globals: PyDictRef,
#[pyarg(any, optional)]
name: OptionalArg<PyStrRef>,
#[pyarg(any, optional)]
defaults: OptionalArg<PyTupleRef>,
#[pyarg(any, optional)]
closure: OptionalArg<PyTupleRef>,
#[pyarg(any, optional)]
kwdefaults: OptionalArg<PyDictRef>,
}

impl Constructor for PyFunction {
type Args = PyFunctionNewArgs;

fn py_new(cls: PyTypeRef, args: Self::Args, vm: &VirtualMachine) -> PyResult {
// Handle closure - must be a tuple of cells
let closure = if let Some(closure_tuple) = args.closure.into_option() {
// Check that closure length matches code's free variables
if closure_tuple.len() != args.code.freevars.len() {
return Err(vm.new_value_error(format!(
"{} requires closure of length {}, not {}",
args.code.obj_name,
args.code.freevars.len(),
closure_tuple.len()
)));
}

// Validate that all items are cells and create typed tuple
let typed_closure =
PyTupleTyped::<PyCellRef>::try_from_object(vm, closure_tuple.into())?;
Some(typed_closure)
} else if !args.code.freevars.is_empty() {
return Err(vm.new_type_error("arg 5 (closure) must be tuple".to_owned()));
} else {
None
};

// Get function name - use provided name or default to code object name
let name = args
.name
.into_option()
.unwrap_or_else(|| PyStr::from(args.code.obj_name.as_str()).into_ref(&vm.ctx));

// Get qualname - for now just use the name
let qualname = name.clone();

// Create empty type_params and annotations
let type_params = vm.ctx.new_tuple(vec![]);
let annotations = vm.ctx.new_dict();

// Get doc from code object - for now just use None
let doc = vm.ctx.none();

let func = PyFunction::new(
args.code,
args.globals,
closure,
args.defaults.into_option(),
args.kwdefaults.into_option(),
qualname,
type_params,
annotations,
doc,
vm,
)?;

func.into_ref_with_type(vm, cls).map(Into::into)
}
}

#[pyclass(module = false, name = "method", traverse)]
#[derive(Debug)]
pub struct PyBoundMethod {
Expand Down
11 changes: 2 additions & 9 deletions vm/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,8 +1905,6 @@ impl ExecutingFrame<'_> {
None
};

let module = vm.unwrap_or_none(self.globals.get_item_opt(identifier!(vm, __name__), vm)?);

// pop argc arguments
// argument: name, args, globals
// let scope = self.scope.clone();
Expand All @@ -1919,16 +1917,11 @@ impl ExecutingFrame<'_> {
qualified_name.clone(),
type_params,
annotations.downcast().unwrap(),
module,
vm.ctx.none(),
)
vm,
)?
.into_pyobject(vm);

let name = qualified_name.as_str().split('.').next_back().unwrap();
func_obj.set_attr(identifier!(vm, __name__), vm.new_pyobj(name), vm)?;
func_obj.set_attr(identifier!(vm, __qualname__), qualified_name, vm)?;
func_obj.set_attr(identifier!(vm, __doc__), vm.ctx.none(), vm)?;

self.push_value(func_obj);
Ok(None)
}
Expand Down
Loading