Skip to content

Rework issubclass #5867

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 5 commits into from
Jun 29, 2025
Merged

Rework issubclass #5867

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8abf2da
check_exact
youknowone Jun 28, 2025
7a92989
check_class
youknowone Jun 28, 2025
241a8f1
Type compatibility tools
youknowone Jun 28, 2025
6e08225
abstract_issubclass
youknowone Jun 29, 2025
4e5007a
recursive_issubclass
youknowone Jun 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
recursive_issubclass
  • Loading branch information
@youknowone
youknowone committed Jun 29, 2025
commit 4e5007a99cfe17e0db59876a1346499023ca6a83
39 changes: 21 additions & 18 deletions vm/src/protocol/object.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,26 +462,29 @@ impl PyObject {
}

fn recursive_issubclass(&self, cls: &PyObject, vm: &VirtualMachine) -> PyResult<bool> {
if let (Ok(obj), Ok(cls)) = (self.try_to_ref::<PyType>(vm), cls.try_to_ref::<PyType>(vm)) {
Ok(obj.fast_issubclass(cls))
} else {
// Check if derived is a class
self.check_class(vm, || {
format!("issubclass() arg 1 must be a class, not {}", self.class())
})?;

// Check if cls is a class, tuple, or union
if !cls.class().is(vm.ctx.types.union_type) {
cls.check_class(vm, || {
format!(
"issubclass() arg 2 must be a class, a tuple of classes, or a union, not {}",
cls.class()
)
})?;
}
// Fast path for both being types (matches CPython's PyType_Check)
if let Some(cls) = PyType::check(cls)
&& let Some(derived) = PyType::check(self)
{
// PyType_IsSubtype equivalent
return Ok(derived.is_subtype(cls));
}
// Check if derived is a class
self.check_class(vm, || {
format!("issubclass() arg 1 must be a class, not {}", self.class())
})?;

self.abstract_issubclass(cls, vm)
// Check if cls is a class, tuple, or union (matches CPython's order and message)
if !cls.class().is(vm.ctx.types.union_type) {
cls.check_class(vm, || {
format!(
"issubclass() arg 2 must be a class, a tuple of classes, or a union, not {}",
cls.class()
)
})?;
}

self.abstract_issubclass(cls, vm)
}

/// Real issubclass check without going through __subclasscheck__
Expand Down
Loading