Skip to content

Fix frozenset subclass keyword arguments #8287

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
Jul 17, 2026
Merged

Fix frozenset subclass keyword arguments #8287

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_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,6 @@ class TestFrozenSetSubclass(TestFrozenSet):
thetype = FrozenSetSubclass
basetype = frozenset

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_keywords_in_subclass(self):
class subclass(frozenset):
pass
Expand Down
47 changes: 35 additions & 12 deletions crates/vm/src/builtins/set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,31 +958,54 @@ impl Constructor for PyFrozenSet {
type Args = Vec<PyObjectRef>;

fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
let iterable: OptionalArg<PyObjectRef> = args.bind(vm)?;
let is_exact_frozenset = cls.is(vm.ctx.types.frozenset_type);
let is_frozenset_init = {
let cls_init = cls.slots.init.load().map(|init| init as usize);
let frozenset_init = vm
.ctx
.types
.frozenset_type
.slots
.init
.load()
.map(|init| init as usize);
cls_init == frozenset_init
};

// Optimizations for exact frozenset type
if cls.is(vm.ctx.types.frozenset_type) {
let iterable_opt = if is_exact_frozenset || is_frozenset_init {
let iterable: OptionalArg<PyObjectRef> = args.bind(vm)?;

// Return exact frozenset as-is
if let OptionalArg::Present(ref input) = iterable
&& let Ok(fs) = input.clone().downcast_exact::<Self>(vm)
if is_exact_frozenset
&& let OptionalArg::Present(input) = &iterable
&& input.class().is(vm.ctx.types.frozenset_type)
{
return Ok(fs.into_pyref().into());
return Ok(input.clone());
}

// Return empty frozenset singleton
if iterable.is_missing() {
return Ok(vm.ctx.empty_frozenset.clone().into());
iterable.into_option()
} else {
match &args.args[..] {
[] => None,
[iterable] => Some(iterable.clone()),
slice => {
return Err(vm.new_type_error(format!(
"frozenset expected at most 1 argument, got {}",
slice.len()
)));
}
}
}
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
coderabbitai[bot] marked this conversation as resolved.

let elements: Vec<PyObjectRef> = if let OptionalArg::Present(iterable) = iterable {
let elements = if let Some(iterable) = iterable_opt {
iterable.try_to_value(vm)?
} else {
vec![]
};

// Return empty frozenset singleton for exact frozenset types (when iterable was empty)
if elements.is_empty() && cls.is(vm.ctx.types.frozenset_type) {
// Return empty frozenset singleton
if is_exact_frozenset && elements.is_empty() {
return Ok(vm.ctx.empty_frozenset.clone().into());
}

Expand Down
Loading