Add basic attribute handling in exception handlers

Author: hermansje

pythonwhat/parsing.py

@@ -816,7 +816,7 @@ def visit_Try(self, node):
                     handlers[el.id] = self.parse_handler(handler)
             else:
                 # either general handler, or single error handler
-                k = "all" if not handler.type else handler.type.id
+                k = "all" if not handler.type else self.get_identifier(handler.type)
                 handlers[k] = self.parse_handler(handler)
 
         self.out.append(
@@ -829,6 +829,18 @@ def visit_Try(self, node):
             }
         )
 
+    @staticmethod
+    def get_identifier(obj):
+        # if only name needs to be correct
+        return getattr(obj, "id", None) or getattr(obj, "attr")
+        # if full attr chain must match
+        # name = ""
+        # while hasattr(obj, "attr"):
+        #     name = "." + obj.attr + name
+        #     obj = obj.value
+        # name = obj.id + name
+        # return name
+
     @staticmethod
     def parse_handler(handler):
         return {"node": handler.body, "target_vars": TargetVars([handler.name])}

tests/test_check_try_except.py

@@ -11,10 +11,12 @@ def data():
     x = max([1, 2, 'a'])
 except TypeError as e:
     x = 'typeerror'
-except ValueError:
+except __builtin__.ValueError:
     x = 'valueerror'
 except (ZeroDivisionError, IOError) as e:
     x = e
+except pd.io.common.CParserError:
+    x = 'CParserError'
 except :
     x = 'someerror'
 else :
@@ -29,6 +31,7 @@ def data():
     check_handlers('ValueError').has_equal_value(name = 'x'),
     check_handlers('ZeroDivisionError').set_context(e = 'anerror').has_equal_value(name = 'x'),
     check_handlers('IOError').set_context(e = 'anerror').has_equal_value(name = 'x'),
+    check_handlers('CParserError').has_equal_value(name = 'x'),
     check_handlers('all').has_equal_value(name = 'x'),
     check_orelse().has_equal_value(name = 'passed'),
     check_finalbody().check_function('print').check_args(0).has_equal_value()
@@ -197,13 +200,35 @@ def test_fail_09(data):
         """
     sct_payload = helper.run(data)
     assert not sct_payload["correct"]
+    assert (
+        sct_payload["message"]
+        == "Check the first try statement. Are you sure you defined the <code>CParserError</code> <code>except</code> block?"
+    )
+
+def test_fail_10(data):
+    data[
+        "DC_CODE"
+    ] = """
+try:
+    x = max([1, 2, 'a'])
+except TypeError as e:
+    x = 'typeerror'
+except ValueError:
+    x = 'valueerror'
+except (ZeroDivisionError, IOError) as e:
+    x = e
+except pd.io.common.CParserError as e:
+    x = 'CParserError'
+        """
+    sct_payload = helper.run(data)
+    assert not sct_payload["correct"]
     assert (
         sct_payload["message"]
         == "Check the first try statement. Are you sure you defined the <code>all</code> <code>except</code> block?"
     )
 
 
-def test_fail_10(data):
+def test_fail_11(data):
     data[
         "DC_CODE"
     ] = """
@@ -215,6 +240,8 @@ def test_fail_10(data):
     x = 'valueerror'
 except (ZeroDivisionError, IOError) as e:
     x = e
+except pd.io.common.CParserError as e:
+    x = 'CParserError'
 except :
     x = 'someerrors'
     """
@@ -226,7 +253,7 @@ def test_fail_10(data):
     )
 
 
-def test_fail_11(data):
+def test_fail_12(data):
     data[
         "DC_CODE"
     ] = """
@@ -238,6 +265,8 @@ def test_fail_11(data):
     x = 'valueerror'
 except (ZeroDivisionError, IOError) as e:
     x = e
+except pd.io.common.CParserError as e:
+    x = 'CParserError'
 except :
     x = 'someerror'
         """
@@ -249,7 +278,7 @@ def test_fail_11(data):
     )
 
 
-def test_fail_12(data):
+def test_fail_13(data):
     data[
         "DC_CODE"
     ] = """
@@ -261,6 +290,8 @@ def test_fail_12(data):
     x = 'valueerror'
 except (ZeroDivisionError, IOError) as e:
     x = e
+except pd.io.common.CParserError as e:
+    x = 'CParserError'
 except :
     x = 'someerror'
 else :
@@ -274,7 +305,7 @@ def test_fail_12(data):
     )
 
 
-def test_fail_13(data):
+def test_fail_14(data):
     data[
         "DC_CODE"
     ] = """
@@ -286,6 +317,8 @@ def test_fail_13(data):
     x = 'valueerror'
 except (ZeroDivisionError, IOError) as e:
     x = e
+except pd.io.common.CParserError as e:
+    x = 'CParserError'
 except :
     x = 'someerror'
 else :
@@ -299,7 +332,7 @@ def test_fail_13(data):
     )
 
 
-def test_fail_14(data):
+def test_fail_15(data):
     data[
         "DC_CODE"
     ] = """
@@ -311,6 +344,8 @@ def test_fail_14(data):
     x = 'valueerror'
 except (ZeroDivisionError, IOError) as e:
     x = e
+except pd.io.common.CParserError as e:
+    x = 'CParserError'
 except :
     x = 'someerror'
 else :