Merge 2f776ae05a0f378e8f65b90a4e6d8ba622801dd5 into 2fa14c588463bf576bce766f6ae996e7e8e10271

src/interpreter/ceval.c

@@ -1167,10 +1167,10 @@ __NEXT_STEP:
                 has_invalid = true;
             }
             if(has_invalid) {
-                py_newnil(&self->unhandled_exc);
+                py_clearexc(NULL);
                 TypeError("catching classes that do not inherit from BaseException is not allowed");
                 c11_vector__pop(&frame->exc_stack);
-                goto __ERROR;
+                goto __ERROR_RE_RAISE;
             } else {
                 py_newbool(TOP(), ok);
                 DISPATCH();

tests/280_exception.py

@@ -210,9 +210,7 @@ try:
     try:
         result = 10 / 0
     except (ZeroDivisionError, 1) as e:
-        assert False
+        assert type(e) == ZeroDivisionError
-    except (TypeError) as e:
-        assert False
 except Exception as e:
     assert type(e) == TypeError