Merge c048ec9faf4bfe02da004dce69471897933c3617 into 2fa14c588463bf576bce766f6ae996e7e8e10271

src/interpreter/ceval.c

@@ -1163,39 +1163,10 @@ __NEXT_STEP:
             DISPATCH();
         }
         case OP_EXCEPTION_MATCH: {
-            bool ok = false;
+            if(!py_checktype(TOP(), tp_type)) goto __ERROR;
-            bool has_invalid = false;
+            bool ok = py_isinstance(&self->unhandled_exc, py_totype(TOP()));
-            if(TOP()->type == tp_type) {
+            py_newbool(TOP(), ok);
-                ok = py_isinstance(&self->unhandled_exc, py_totype(TOP()));
+            DISPATCH();
-            } 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((data + i)->type != tp_type) {
-                        has_invalid = true;
-                        break;
-                    }
-                }
-                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_newnil(&self->unhandled_exc);
-                TypeError("catching classes that do not inherit from BaseException is not allowed");
-                c11_vector__pop(&frame->exc_stack);
-                goto __ERROR;
-            } else {
-                py_newbool(TOP(), ok);
-                DISPATCH();
-            }
         }
         case OP_HANDLE_EXCEPTION: {
             FrameExcInfo* info = Frame__top_exc_info(frame);

tests/280_exception.py

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