rename check_if to check_if_else (consistent with test_if_else)

Author: machow

pythonwhat/check_wrappers.py

@@ -25,7 +25,7 @@
         'for_loop': '{ordinal} for statement',
         'function_def': 'definition of `{index}()`',
         'if_exp': '{ordinal} if expression',
-        'if': '{ordinal} if statement',
+        'if_else': '{ordinal} if statement',
         'lambda_function': '{ordinal} lambda function',
         'try_except': '{ordinal} try statement',
         'while': '{ordinal} `while` loop',

pythonwhat/parsing.py

@@ -822,7 +822,7 @@ def parse_handler(handler): return {
         "object_assignments": ObjectAssignmentParser,
         "operators": OperatorParser,
         "imports": ImportParser,
-        "ifs": IfParser,
+        "if_elses": IfParser,
         "if_exps": IfExpParser,
         "whiles": WhileParser,
         "for_loops": ForParser,

pythonwhat/test_funcs/test_if_else.py

@@ -73,7 +73,7 @@ def test_if_else(index=1,
 
 
     # get state with specific if block
-    node_name = 'if_exps' if use_if_exp else 'ifs'
+    node_name = 'if_exps' if use_if_exp else 'if_elses'
     # TODO original typestr for check_node used if rather than `if`
     state = check_node(node_name, index-1, "if statement", MSG_MISSING, MSG_PREPEND if expand_message else "", state=state)