Use protowhat Feedback

Author: hermansje

pythonwhat/Feedback.py

@@ -8,7 +8,6 @@
 from protowhat.State import State as ProtoState
 from protowhat.selectors import DispatcherInterface
 from protowhat.Feedback import InstructorError
-from pythonwhat.Feedback import Feedback
 from pythonwhat import signatures
 from pythonwhat.converters import get_manual_converters
 from collections.abc import Mapping
@@ -203,26 +202,22 @@ def parse_external(self, code):
             e.filename = "script.py"
             # no line info for now
             self.report(
-                Feedback(
-                    "Your code could not be parsed due to an error in the indentation:<br>`%s.`"
-                    % str(e)
-                )
+                "Your code could not be parsed due to an error in the indentation:<br>`%s.`"
+                % str(e)
             )
 
         except SyntaxError as e:
             e.filename = "script.py"
             # no line info for now
             self.report(
-                Feedback(
-                    "Your code can not be executed due to a syntax error:<br>`%s.`"
-                    % str(e)
-                )
+                "Your code can not be executed due to a syntax error:<br>`%s.`"
+                % str(e)
             )
 
         # Can happen, can't catch this earlier because we can't differentiate between
         # TypeError in parsing or TypeError within code (at runtime).
         except:
-            self.report(Feedback("Something went wrong while parsing your code."))
+            self.report("Something went wrong while parsing your code.")
 
         return res
 

pythonwhat/State.py

@@ -1,8 +1,6 @@
 from pythonwhat.checks.check_logic import multi
 from pythonwhat.checks.has_funcs import has_part
-from protowhat.Test import Test
 from protowhat.Feedback import InstructorError
-from pythonwhat.Feedback import Feedback
 from pythonwhat.tasks import setUpNewEnvInProcess, breakDownNewEnvInProcess
 from pythonwhat.utils import get_ord
 from pythonwhat.utils_ast import assert_ast
@@ -14,12 +12,6 @@ def render(template, kwargs):
     return Template(template).render(**kwargs)
 
 
-class StubState:
-    def __init__(self, highlight, highlighting_disabled):
-        self.highlight = highlight
-        self.highlighting_disabled = highlighting_disabled
-
-
 def part_to_child(stu_part, sol_part, append_message, state, node_name=None):
     # stu_part and sol_part will be accessible on all templates
     append_message["kwargs"].update({"stu_part": stu_part, "sol_part": sol_part})
@@ -139,7 +131,7 @@ def check_node(
         stu_out[index]
     except (KeyError, IndexError):  # TODO comment errors
         _msg = state.build_message(missing_msg, fmt_kwargs)
-        state.report(Feedback(_msg, state))
+        state.report(_msg)
 
     # get node at index
     stu_part = stu_out[index]
@@ -167,20 +159,14 @@ def with_context(state, *args, child=None):
         process=state.student_process, context=state.student_parts["with_items"]
     )
     if isinstance(student_res, AttributeError):
-        state.report(
-            Feedback(
-                "In your `with` statement, you're not using a correct context manager.",
-                child.highlight,  # TODO
-            )
+        child.report(
+            "In your `with` statement, you're not using a correct context manager."
         )
 
     if isinstance(student_res, (AssertionError, ValueError, TypeError)):
-        state.report(
-            Feedback(
-                "In your `with` statement, the number of values in your context manager "
-                "doesn't correspond to the number of variables you're trying to assign it to.",
-                child.highlight,
-            )
+        child.report(
+            "In your `with` statement, the number of values in your context manager "
+            "doesn't correspond to the number of variables you're trying to assign it to."
         )
 
     # run subtests
@@ -200,11 +186,8 @@ def with_context(state, *args, child=None):
         close_student_context = breakDownNewEnvInProcess(process=state.student_process)
         if isinstance(close_student_context, Exception):
             state.report(
-                Feedback(
-                    "Your `with` statement can not be closed off correctly, you're "
-                    + "not using the context manager correctly.",
-                    state,
-                )
+                "Your `with` statement can not be closed off correctly, you're "
+                "not using the context manager correctly."
             )
     return state
 

pythonwhat/checks/check_funcs.py

@@ -1,9 +1,7 @@
-from pythonwhat.checks.check_funcs import part_to_child, StubState
+from pythonwhat.checks.check_funcs import part_to_child
 from pythonwhat.tasks import getSignatureInProcess
 from pythonwhat.utils import get_ord, get_times
-from protowhat.Test import Test
 from protowhat.Feedback import InstructorError
-from pythonwhat.Feedback import Feedback
 from pythonwhat.parsing import IndexedDict
 from functools import partial
 
@@ -131,7 +129,7 @@ def check_function(
         stu_parts = {**stu_out[name][index]}
     except (KeyError, IndexError):
         _msg = state.build_message(missing_msg, fmt_kwargs, append=append_missing)
-        state.report(Feedback(_msg, state))
+        state.report(_msg)
 
     # Signatures -----
     if signature:
@@ -163,11 +161,7 @@ def check_function(
             _msg = state.build_message(
                 params_not_matched_msg, fmt_kwargs, append=append_params_not_matched
             )
-            state.report(
-                Feedback(
-                    _msg, StubState(stu_parts["node"], state.highlighting_disabled)
-                )
-            )
+            state.to_child(highlight=stu_parts["node"]).report(_msg)
 
     # three types of parts: pos_args, keywords, args (e.g. these are bound to sig)
     append_message = {"msg": expand_msg, "kwargs": fmt_kwargs}

pythonwhat/checks/check_function.py

@@ -1,6 +1,5 @@
 from pythonwhat.Test import EqualTest
-from protowhat.Feedback import InstructorError
-from pythonwhat.Feedback import Feedback
+from protowhat.Feedback import Feedback, InstructorError
 from pythonwhat.State import State
 from functools import singledispatch
 from pythonwhat.checks.check_funcs import check_part_index

pythonwhat/checks/check_has_context.py

@@ -4,8 +4,7 @@
     InstanceProcessTest,
     DefinedCollProcessTest,
 )
-from protowhat.Feedback import InstructorError
-from pythonwhat.Feedback import Feedback
+from protowhat.Feedback import Feedback, InstructorError
 from pythonwhat.tasks import (
     isDefinedInProcess,
     isInstanceInProcess,

pythonwhat/checks/check_object.py

@@ -10,8 +10,7 @@
 )
 from protowhat.Test import Test
 from pythonwhat.Test import EqualTest, DefinedCollTest
-from protowhat.Feedback import InstructorError
-from pythonwhat.Feedback import Feedback
+from protowhat.Feedback import Feedback, InstructorError
 from pythonwhat import utils
 from functools import partial
 import re
@@ -53,7 +52,7 @@ def verify(part, index):
     try:
         verify(state.student_parts[name], index)
     except (KeyError, IndexError):
-        state.report(Feedback(_msg, state))
+        state.report(_msg)
 
     return state
 
@@ -101,7 +100,7 @@ def shout(word):
 
     if d["stu_len"] != d["sol_len"]:
         _msg = state.build_message(unequal_msg, d)
-        state.report(Feedback(_msg, state))
+        state.report(_msg)
 
     return state
 
@@ -195,7 +194,7 @@ def parse_tree(tree):
     if exact and not code:
         state.do_test(EqualTest(stu_rep, sol_rep, Feedback(_msg, state)))
     elif not sol_rep in stu_rep:
-        state.report(Feedback(_msg, state))
+        state.report(_msg)
 
     return state
 
@@ -347,13 +346,12 @@ def has_expr(
     if (test == "error") ^ isinstance(eval_stu, Exception):
         fmt_kwargs["stu_str"] = str_stu
         _msg = state.build_message(error_msg, fmt_kwargs, append=append)
-        feedback = Feedback(_msg, state)
-        state.report(feedback)
+        state.report(_msg)
 
     # name is undefined after running expression
     if isinstance(eval_stu, UndefinedValue):
         _msg = state.build_message(undefined_msg, fmt_kwargs, append=append)
-        state.report(Feedback(_msg, state))
+        state.report(_msg)
 
     # test equality of results
     _msg = state.build_message(incorrect_msg, fmt_kwargs, append=append)
@@ -755,7 +753,7 @@ def has_no_error(
         _msg = state.build_message(
             incorrect_msg, {"error": str(state.reporter.errors[0])}
         )
-        state.report(Feedback(_msg, state))
+        state.report(_msg)
 
     return state
 

pythonwhat/checks/has_funcs.py

@@ -1,9 +1,7 @@
 import ast
 
-from protowhat.Feedback import InstructorError
-from pythonwhat.Feedback import Feedback
+from protowhat.Feedback import Feedback, InstructorError
 from pythonwhat.Test import EqualTest
-from pythonwhat.checks.check_funcs import StubState
 from pythonwhat.checks.has_funcs import evalCalls
 from pythonwhat.tasks import ReprFail
 
@@ -130,10 +128,10 @@ def call(
 
     # either error test and no error, or vice-versa
     stu_node = state.student_parts["node"]
-    stu_state = StubState(stu_node, state.highlighting_disabled)
+    stu_state = state.to_child(highlight=stu_node)
     if (test == "error") ^ isinstance(eval_stu, Exception):
         _msg = state.build_message(error_msg, fmt_kwargs)
-        state.report(Feedback(_msg, stu_state))
+        stu_state.report(_msg)
 
     # incorrect result
     _msg = state.build_message(incorrect_msg, fmt_kwargs)