From 548e76cfd6d1f8c1419bc827aae0bd87dc7867b5 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Wed, 26 Mar 2014 18:55:29 +0000
Subject: [PATCH] py: Use _is_subclass_fast instead of _exception_match.

---
 py/objgenerator.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/py/objgenerator.c b/py/objgenerator.c
index 3cfa02a0a..eed5a5511 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -174,8 +174,9 @@ STATIC mp_obj_t gen_instance_close(mp_obj_t self_in) {
     }
     // Swallow StopIteration & GeneratorExit (== successful close), and re-raise any other
     if (ret_kind == MP_VM_RETURN_EXCEPTION) {
-        if (mp_obj_exception_match(ret, &mp_type_GeneratorExit) ||
-            mp_obj_exception_match(ret, &mp_type_StopIteration)) {
+        // ret should always be an instance of an exception class
+        if (mp_obj_is_subclass_fast(mp_obj_get_type(ret), &mp_type_GeneratorExit) ||
+            mp_obj_is_subclass_fast(mp_obj_get_type(ret), &mp_type_StopIteration)) {
             return mp_const_none;
         }
         nlr_jump(ret);