Fix callable (again)

coolreader18 · coolreader18 · commit ac3cfca0fa1a · 2019-04-19T12:04:22.000-05:00
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -674,13 +674,7 @@ impl VirtualMachine {
             PyFunction => true,
             PyMethod => true,
             PyBuiltinFunction => true,
-            obj => {
-                if let Some(dict) = &obj.dict {
-                    dict.contains_key("__call__", self)
-                } else {
-                    objtype::class_has_attr(&obj.class(), "__call__")
-                }
-            },
+            obj => objtype::class_has_attr(&obj.class(), "__call__"),
         )
     }
 

Original file line number	Diff line number	Diff line change
`@@ -674,13 +674,7 @@ impl VirtualMachine {`
`674`	`674`	`PyFunction => true,`
`675`	`675`	`PyMethod => true,`
`676`	`676`	`PyBuiltinFunction => true,`
`677`		`- obj => {`
`678`		`- if let Some(dict) = &obj.dict {`
`679`		`- dict.contains_key("__call__", self)`
`680`		`- } else {`
`681`		`- objtype::class_has_attr(&obj.class(), "__call__")`
`682`		`- }`
`683`		`- },`
	`677`	`+ obj => objtype::class_has_attr(&obj.class(), "__call__"),`
`684`	`678`	`)`
`685`	`679`	`}`
`686`	`680`