Commit92c943b

committed

fix bad first arg

1 parent9384106 commit92c943bCopy full SHA for 92c943b

File tree

+233

-227

lines changed

+233

-227

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,14 @@ def method(self):`
`385`	`385`	`withself.assertRaisesRegex(AttributeError,"'super' object has no attribute 'msg'"):`
`386`	`386`	`C().method()`
`387`	`387`
	`388`	`+deftest_bad_first_arg(self):`
	`389`	`+classC:`
	`390`	`+defmethod(self):`
	`391`	`+returnsuper(1,self).method()`
	`392`	`+`
	`393`	`+withself.assertRaisesRegex(TypeError,"argument 1 must be a type"):`
	`394`	`+C().method()`
	`395`	`+`
`388`	`396`
`389`	`397`	`if__name__=="__main__":`
`390`	`398`	`unittest.main()`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1556,10 +1556,9 @@ dummy_func(`
`1556`	`1556`
`1557`	`1557`	`inst(LOAD_SUPER_ATTR, (global_super,class,self--res2if (oparg&1),res)) {`
`1558`	`1558`	`PyObject*name=GETITEM(frame->f_code->co_names,oparg >>2);`
`1559`		`-if (global_super== (PyObject*)&PySuper_Type) {`
	`1559`	`+if (global_super== (PyObject*)&PySuper_Type&&PyType_Check(class)) {`
`1560`	`1560`	`intmeth_found=0;`
`1561`	`1561`	`Py_DECREF(global_super);`
`1562`		`-assert(PyType_Check(class));`
`1563`	`1562`	`res=_PySuper_Lookup((PyTypeObject*)class,self,name,oparg&1 ?&meth_found :NULL);`
`1564`	`1563`	`Py_DECREF(class);`
`1565`	`1564`	`if (res==NULL) {`

Comments

(0)