Merge 5ab8381471d55d3e966db4987942ec34665b44fa into 2fa14c588463bf576bce766f6ae996e7e8e10271

src/interpreter/ceval.c

@@ -1143,20 +1143,33 @@ __NEXT_STEP:
         }
         case OP_EXCEPTION_MATCH: {
             bool ok = false;
+            bool has_invalid = false;
             if(TOP()->type == tp_type) {
                 ok = py_isinstance(&self->unhandled_exc, py_totype(TOP()));
             } else if(TOP()->type == tp_tuple) {
                 int len = py_tuple_len(TOP());
                 py_ObjectRef data = py_tuple_data(TOP());
                 for(int i = 0; i < len; i++) {
-                    if(!py_checktype(data + i, tp_type)) goto __ERROR;
-                    if(py_isinstance(&self->unhandled_exc, py_totype(data + i))) {
-                        ok = true;
+                    if((data + i)->type != tp_type) {
+                        has_invalid = true;
                         break;
                     }
                 }
-            } else
-                goto __ERROR;
+                if(!has_invalid) {
+                    for(int i = 0; i < len; i++) {
+                        if(py_isinstance(&self->unhandled_exc, py_totype(data + i))) {
+                            ok = true;
+                            break;
+                        }
+                    }
+                }
+            } else {
+                has_invalid = true;
+            }
+            if(has_invalid) {
+                py_clearexc(NULL);
+                TypeError("catching classes that do not inherit from BaseException is not allowed");
+            }
             py_newbool(TOP(), ok);
             DISPATCH();
         }

tests/280_exception.py

@@ -201,6 +201,19 @@ for i in range(6):
             a.append(i)
 assert a == [0, 1, 3, 4, 5]
 
+try:
+    result = 10 / 0
+except (ZeroDivisionError, TypeError) as e:
+    assert type(e) == ZeroDivisionError
+
+try:
+    try:
+        result = 10 / 0
+    except (ZeroDivisionError, 1) as e:
+        assert type(e) == ZeroDivisionError
+except Exception as e:
+    assert type(e) == TypeError
+
 """
 # finally, only
 def finally_only():