From 78069284a8640aa6306ebfa14664b3533e90dc81 Mon Sep 17 00:00:00 2001 From: coolreader18 <33094578+coolreader18@users.noreply.github.com> Date: Sun, 29 Sep 2019 23:22:59 -0500 Subject: [PATCH] Only have type_new on `object` --- vm/src/obj/objobject.rs | 1 + vm/src/obj/objtype.rs | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/vm/src/obj/objobject.rs b/vm/src/obj/objobject.rs index 27b9e359d..eaebf8b8b 100644 --- a/vm/src/obj/objobject.rs +++ b/vm/src/obj/objobject.rs @@ -158,6 +158,7 @@ pub fn init(context: &PyContext) { extend_class!(context, object, { (slot new) => new_instance, + // yeah, it's `type_new`, but we're putting here so it's available on every object "__new__" => context.new_classmethod(objtype::type_new), "__init__" => context.new_rustfunc(object_init), "__class__" => diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs index 1aacd2ea9..6e83e2426 100644 --- a/vm/src/obj/objtype.rs +++ b/vm/src/obj/objtype.rs @@ -235,7 +235,6 @@ pub fn init(ctx: &PyContext) { .add_getter(type_dict) .add_setter(type_dict_setter) .create(), - "__new__" => ctx.new_classmethod(type_new), (slot new) => type_new_slot, "__mro__" => PropertyBuilder::new(ctx)