type.__getattribute__ should be bound to type!

cthulahoops · cthulahoops · commit 00d0bbe5fd07 · 2018-11-04T15:57:50.000Z
diff --git a/tests/snippets/class.py b/tests/snippets/class.py
@@ -27,12 +27,9 @@ def kungfu(x):
 
 
 bar = Bar()
-bar.fubar(2)
 
-# TODO: make below work:
-# Bar.fubar(2)
+bar.fubar(2)
+Bar.fubar(2)
 
 bar.kungfu(3)
-# TODO: make below work:
-# Bar.kungfu(3)
-
+Bar.kungfu(3)
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -29,6 +29,7 @@ pub fn init(context: &PyContext) {
     type_type.set_attr("__class__", context.new_member_descriptor(type_new));
     type_type.set_attr("__repr__", context.new_rustfunc(type_repr));
     type_type.set_attr("__prepare__", context.new_rustfunc(type_prepare));
+    type_type.set_attr("__getattribute__", context.new_rustfunc(type_getattribute));
 }
 
 fn type_mro(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
@@ -85,7 +86,7 @@ pub fn get_type_name(typ: &PyObjectRef) -> String {
 }
 
 pub fn type_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
-    debug!("type.__new__{:?}", args);
+    debug!("type.__new__ {:?}", args);
     if args.args.len() == 2 {
         arg_check!(
             vm,
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -17,8 +17,8 @@ use super::obj::objsequence;
 use super::obj::objstr;
 use super::obj::objtype;
 use super::pyobject::{
-    AttributeProtocol, DictProtocol, PyContext, PyFuncArgs, PyObjectKind, PyObjectRef, PyResult,
-    TypeProtocol,
+    AttributeProtocol, DictProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectKind, PyObjectRef,
+    PyResult, TypeProtocol,
 };
 use super::stdlib;
 use super::sysmodule;
@@ -93,7 +93,11 @@ impl VirtualMachine {
     }
 
     pub fn new_bound_method(&self, function: PyObjectRef, object: PyObjectRef) -> PyObjectRef {
-        self.ctx.new_bound_method(function, object)
+        if object.is(&self.get_none()) {
+            function
+        } else {
+            self.ctx.new_bound_method(function, object)
+        }
     }
 
     pub fn get_type(&self) -> PyObjectRef {
@@ -202,7 +206,13 @@ impl VirtualMachine {
         let cls = obj.typ();
         match cls.get_attr(method_name) {
             Some(func) => {
-                trace!("vm.call_method {:?} {:?} -> {:?}", obj, method_name, func);
+                trace!(
+                    "vm.call_method {:?} {:?} {:?} -> {:?}",
+                    obj,
+                    cls,
+                    method_name,
+                    func
+                );
                 let wrapped = self.call_get_descriptor(func, obj.clone())?;
                 self.invoke(wrapped, args)
             }
@@ -423,6 +433,7 @@ impl VirtualMachine {
 
     // get_attribute should be used for full attribute access (usually from user code).
     pub fn get_attribute(&mut self, obj: PyObjectRef, attr_name: PyObjectRef) -> PyResult {
+        trace!("vm.__getattribute__: {:?} {:?}", obj, attr_name);
         self.call_method(&obj, "__getattribute__", vec![attr_name])
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ pub fn init(context: &PyContext) {`
`29`	`29`	`type_type.set_attr("__class__", context.new_member_descriptor(type_new));`
`30`	`30`	`type_type.set_attr("__repr__", context.new_rustfunc(type_repr));`
`31`	`31`	`type_type.set_attr("__prepare__", context.new_rustfunc(type_prepare));`
	`32`	`+ type_type.set_attr("__getattribute__", context.new_rustfunc(type_getattribute));`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`fn type_mro(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`@@ -85,7 +86,7 @@ pub fn get_type_name(typ: &PyObjectRef) -> String {`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`pub fn type_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`88`		`- debug!("type.__new__{:?}", args);`
	`89`	`+ debug!("type.__new__ {:?}", args);`
`89`	`90`	`if args.args.len() == 2 {`
`90`	`91`	`arg_check!(`
`91`	`92`	`vm,`