Skip to content

type.__dict__ #5957

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 2 commits into from
Jul 13, 2025
Merged

type.__dict__ #5957

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d196a5
type.__dict__
youknowone Jun 27, 2025
eeaf78f
fix
youknowone Jun 28, 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
fix
  • Loading branch information
@youknowone
youknowone committed Jul 13, 2025
commit eeaf78fad9e8c1ee8440e22f10d4eb0241554a10
12 changes: 12 additions & 0 deletions extra_tests/snippets/builtin_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,3 +595,15 @@ def my_repr_func():

# https://github.com/RustPython/RustPython/issues/3100
assert issubclass(types.BuiltinMethodType, types.BuiltinFunctionType)

assert type.__dict__["__dict__"].__objclass__ is type
assert (
type(type(type.__dict__["__dict__"]).__objclass__).__name__ == "member_descriptor"
)


class A(type):
pass


assert "__dict__" not in A.__dict__
57 changes: 32 additions & 25 deletions vm/src/builtins/type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,9 +936,9 @@ impl Constructor for PyType {
return Err(vm.new_value_error("type name must not contain null characters"));
}

let (metatype, base, bases) = if bases.is_empty() {
let (metatype, base, bases, base_is_type) = if bases.is_empty() {
let base = vm.ctx.types.object_type.to_owned();
(metatype, base.clone(), vec![base])
(metatype, base.clone(), vec![base], false)
} else {
let bases = bases
.iter()
Expand Down Expand Up @@ -972,8 +972,9 @@ impl Constructor for PyType {
};

let base = best_base(&bases, vm)?;
let base_is_type = base.is(vm.ctx.types.type_type);

(metatype, base.to_owned(), bases)
(metatype, base.to_owned(), bases, base_is_type)
};

let qualname = dict
Expand Down Expand Up @@ -1018,6 +1019,25 @@ impl Constructor for PyType {
attributes.insert(identifier!(vm, __hash__), vm.ctx.none.clone().into());
}

// All *classes* should have a dict. Exceptions are *instances* of
// classes that define __slots__ and instances of built-in classes
// (with exceptions, e.g function)
// Also, type subclasses don't need their own __dict__ descriptor
// since they inherit it from type
if !base_is_type {
let __dict__ = identifier!(vm, __dict__);
attributes.entry(__dict__).or_insert_with(|| {
vm.ctx
.new_static_getset(
"__dict__",
vm.ctx.types.type_type,
subtype_get_dict,
subtype_set_dict,
)
.into()
});
}

// TODO: Flags is currently initialized with HAS_DICT. Should be
// updated when __slots__ are supported (toggling the flag off if
// a class has __slots__ defined).
Expand Down Expand Up @@ -1109,28 +1129,15 @@ impl Constructor for PyType {
}
}

{
let mut attributes = typ.attributes.write();
// All *classes* should have a dict. Exceptions are *instances* of
// classes that define __slots__ and instances of built-in classes
// (with exceptions, e.g function)
let __dict__ = identifier!(vm, __dict__);
attributes.entry(__dict__).or_insert_with(|| unsafe {
vm.ctx
.new_getset("__dict__", &typ, subtype_get_dict, subtype_set_dict)
.into()
});

if let Some(cell) = attributes.get(identifier!(vm, __classcell__)) {
let cell = PyCellRef::try_from_object(vm, cell.clone()).map_err(|_| {
vm.new_type_error(format!(
"__classcell__ must be a nonlocal cell, not {}",
cell.class().name()
))
})?;
cell.set(Some(typ.clone().into()));
};
}
if let Some(cell) = typ.attributes.write().get(identifier!(vm, __classcell__)) {
let cell = PyCellRef::try_from_object(vm, cell.clone()).map_err(|_| {
vm.new_type_error(format!(
"__classcell__ must be a nonlocal cell, not {}",
cell.class().name()
))
})?;
cell.set(Some(typ.clone().into()));
};

// avoid deadlock
let attributes = typ
Expand Down
Loading