fix bad first arg

python · Apr 13, 2023 · 92c943b · 92c943b
1 parent 9384106
commit 92c943b
Show file tree

Hide file tree

Showing 3 changed files with 233 additions and 227 deletions.
diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py
@@ -385,6 +385,14 @@ def method(self):
         with self.assertRaisesRegex(AttributeError, "'super' object has no attribute 'msg'"):
             C().method()
 
+    def test_bad_first_arg(self):
+        class C:
+            def method(self):
+                return super(1, self).method()
+
+        with self.assertRaisesRegex(TypeError, "argument 1 must be a type"):
+            C().method()
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -1556,10 +1556,9 @@ dummy_func(
 
         inst(LOAD_SUPER_ATTR, (global_super, class, self -- res2 if (oparg & 1), res)) {
             PyObject *name = GETITEM(frame->f_code->co_names, oparg >> 2);
-            if (global_super == (PyObject *)&PySuper_Type) {
+            if (global_super == (PyObject *)&PySuper_Type && PyType_Check(class)) {
                 int meth_found = 0;
                 Py_DECREF(global_super);
-                assert(PyType_Check(class));
                 res = _PySuper_Lookup((PyTypeObject *)class, self, name, oparg & 1 ? &meth_found : NULL);
                 Py_DECREF(class);
                 if (res == NULL) {