Skip to content

Fix subclass __getattribute__ being dropped after del Base.__getattr__ #9800

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix subclass __getattribute__ being dropped after del Base.__getattr__ #9800

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
7a01bc1
Initial plan
Copilot Nov 11, 2026
8cc118f
Apply remaining changes
Copilot Nov 11, 2026
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
6 changes: 2 additions & 4 deletions crates/vm/src/types/slot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,8 +1246,8 @@ impl PyType {
if has_getattr {
// Must use wrapper to handle __getattr__
self.slots.getattro.store(Some(getattro_wrapper));
} else if ADD {
match self.lookup_slot_in_mro(name, ctx, |sf| {
} else {
match self.lookup_slot_in_mro(identifier!(ctx, __getattribute__), ctx, |sf| {
if let SlotFunc::GetAttro(f) = sf {
Some(*f)
} else {
Expand All @@ -1264,8 +1264,6 @@ impl PyType {
accessor.inherit_from_mro(self);
}
}
} else {
accessor.inherit_from_mro(self);
}
}
SlotAccessor::TpSetattro => {
Expand Down
15 changes: 15 additions & 0 deletions extra_tests/snippets/builtin_object.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,18 @@ class MissingSlot:


assert MissingSlot().__getstate__() == (None, {"y": 2})


# deleting __getattr__ from a base must not drop a subclass's __getattribute__
class _GABase:
pass


class _GAProxy(_GABase):
def __getattribute__(self, name):
return "hooked"


_GABase.__getattr__ = lambda self, name: "fallback"
del _GABase.__getattr__
assert _GAProxy().x == "hooked"
Loading