Skip to content

Update test_{descr,super}.py from 3.13.9 #6314

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 3 commits into from
Nov 30, 2025
Merged

Update test_{descr,super}.py from 3.13.9 #6314

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92a0cea
Update `test_descr.py` from 3.13.9
ShaharNaveh Nov 29, 2025
c2ea003
Update `test_super.py` from 3.13.9
ShaharNaveh Nov 29, 2025
7c86523
Reuse cls
ShaharNaveh Nov 29, 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
Prev Previous commit
Reuse cls
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Nov 29, 2025
commit 7c865233278d77ef2ad978fcc101b6bb09f3ebb5
16 changes: 6 additions & 10 deletions crates/vm/src/builtins/super.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ impl Representable for PySuper {
}

fn super_check(ty: PyTypeRef, obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyTypeRef> {
let is_type = match obj.clone().downcast::<PyType>() {
let typ = match obj.clone().downcast::<PyType>() {
Ok(cls) if cls.fast_issubclass(&ty) => return Ok(cls),
Ok(_) => true,
Err(_) => false,
Ok(cls) => Some(cls),
Err(_) => None,
};

if obj.fast_isinstance(&ty) {
Expand All @@ -257,13 +257,9 @@ fn super_check(ty: PyTypeRef, obj: PyObjectRef, vm: &VirtualMachine) -> PyResult
return Ok(cls);
}

let (type_or_instance, obj_str) = if is_type {
// SAFETY: This is will always be successful as we already checked at the begining of
// the function.
let typ = unsafe { obj.downcast::<PyType>().unwrap_unchecked() };
("type", typ.name().to_owned())
} else {
("instance of", obj.class().name().to_owned())
let (type_or_instance, obj_str) = match typ {
Some(t) => ("type", t.name().to_owned()),
None => ("instance of", obj.class().name().to_owned()),
};

Err(vm.new_type_error(format!(
Expand Down
Loading