Skip to content

Accept __index__-conforming objects for compile() flags / optimize #7728

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 1 commit into from
Apr 29, 2026
Merged

Accept __index__-conforming objects for compile() flags / optimize #7728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Lib/test/test_call.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,6 @@ def test_vectorcall(self):
result = _testcapi.pyobject_vectorcall(func, args, kwnames)
self.check_result(result, expected)

@unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Expected type 'int' but 'IntWithDict' found.
def test_fastcall_clearing_dict(self):
# Test bpo-36907: the point of the test is just checking that this
# does not crash.
Expand Down
17 changes: 10 additions & 7 deletions crates/vm/src/stdlib/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ mod builtins {
common::hash::PyHash,
function::{
ArgBytesLike, ArgCallable, ArgIndex, ArgIntoBool, ArgIterable, ArgMapping,
ArgStrOrBytesLike, Either, FsPath, FuncArgs, KwArgs, OptionalArg, OptionalOption,
PosArgs,
ArgPrimitiveIndex, ArgStrOrBytesLike, Either, FsPath, FuncArgs, KwArgs, OptionalArg,
OptionalOption, PosArgs,
},
protocol::{PyIter, PyIterReturn},
py_io,
Expand Down Expand Up @@ -99,12 +99,15 @@ mod builtins {
source: PyObjectRef,
filename: FsPath,
mode: PyUtf8StrRef,
// CPython parity: flags / optimize accept any object with __index__,
// not just exact int. Matches the behavior of `int(x)` arg conversion
// used by Python/Python-ast.c::compile.
#[pyarg(any, optional)]
flags: OptionalArg<PyIntRef>,
flags: OptionalArg<ArgPrimitiveIndex<i32>>,
#[pyarg(any, optional)]
dont_inherit: OptionalArg<bool>,
#[pyarg(any, optional)]
optimize: OptionalArg<PyIntRef>,
optimize: OptionalArg<ArgPrimitiveIndex<i32>>,
#[pyarg(any, optional)]
_feature_version: OptionalArg<i32>,
}
Expand Down Expand Up @@ -264,7 +267,7 @@ mod builtins {

let mode_str = args.mode.as_str();

let optimize: i32 = args.optimize.map_or(Ok(-1), |v| v.try_to_primitive(vm))?;
let optimize: i32 = args.optimize.map_or(-1, |v| v.value);
let optimize: u8 = if optimize == -1 {
vm.state.config.settings.optimize
} else {
Expand All @@ -277,7 +280,7 @@ mod builtins {
.source
.fast_isinstance(&_ast::NodeAst::make_static_type())
{
let flags: i32 = args.flags.map_or(Ok(0), |v| v.try_to_primitive(vm))?;
let flags: i32 = args.flags.map_or(0, |v| v.value);
let is_ast_only = !(flags & _ast::PY_CF_ONLY_AST).is_zero();

// func_type mode requires PyCF_ONLY_AST
Expand Down Expand Up @@ -342,7 +345,7 @@ mod builtins {
let source = decode_source_bytes(&source, &args.filename.to_string_lossy(), vm)?;
let source = source.as_str();

let flags = args.flags.map_or(Ok(0), |v| v.try_to_primitive(vm))?;
let flags: i32 = args.flags.map_or(0, |v| v.value);

if !(flags & !_ast::PY_COMPILE_FLAGS_MASK).is_zero() {
return Err(vm.new_value_error("compile() unrecognized flags"));
Expand Down
Loading