Improve child state creation compatibility with protowhat

hermansje · hermansje · commit fe2ed993e555 · 2019-03-25T13:30:15.000+01:00
diff --git a/pythonwhat/State.py b/pythonwhat/State.py
@@ -154,7 +154,7 @@ def build_message(self, tail="", fmt_kwargs=None, append=True):
     def do_test(self, test):
         return self.reporter.do_test(test)
 
-    def to_child_state(
+    def to_child(
         self,
         student_subtree=None,
         solution_subtree=None,
@@ -212,7 +212,7 @@ def to_child_state(
         messages = [*self.messages, append_message]
 
         if not (solution_subtree and student_subtree):
-            return self.update(
+            return self._update(
                 student_context=student_context,
                 solution_context=solution_context,
                 student_env=student_env,
@@ -250,7 +250,7 @@ def to_child_state(
         )
         return child
 
-    def update(self, **kwargs):
+    def _update(self, **kwargs):
         """Return a copy of set, setting kwargs as attributes"""
         child = copy(self)
         for k, v in kwargs.items():
diff --git a/pythonwhat/checks/check_funcs.py b/pythonwhat/checks/check_funcs.py
@@ -26,7 +26,7 @@ def part_to_child(stu_part, sol_part, append_message, state, node_name=None):
 
     # if the parts are dictionaries, use to deck out child state
     if all(isinstance(p, dict) for p in [stu_part, sol_part]):
-        child_state = state.to_child_state(
+        child_state = state.to_child(
             student_subtree=stu_part["node"],
             solution_subtree=sol_part["node"],
             student_context=stu_part.get("target_vars"),
@@ -39,7 +39,7 @@ def part_to_child(stu_part, sol_part, append_message, state, node_name=None):
         )
     else:
         # otherwise, assume they are just nodes
-        child_state = state.to_child_state(
+        child_state = state.to_child(
             student_subtree=stu_part,
             solution_subtree=sol_part,
             append_message=append_message,
diff --git a/pythonwhat/checks/check_has_context.py b/pythonwhat/checks/check_has_context.py
@@ -20,7 +20,7 @@ def _test(state, incorrect_msg, exact_names, tv_name, highlight_name):
     stu_vars = state.student_parts[tv_name]
     sol_vars = state.solution_parts[tv_name]
 
-    child_state = state.to_child_state(
+    child_state = state.to_child(
         student_subtree=state.student_parts.get(highlight_name),
         solution_subtree=state.solution_parts.get(highlight_name),
     )
diff --git a/pythonwhat/checks/check_logic.py b/pythonwhat/checks/check_logic.py
@@ -141,7 +141,7 @@ def override(state, solution):
                 break
 
     kwargs = state.messages[-1] if state.messages else {}
-    child = state.to_child_state(
+    child = state.to_child(
         solution_subtree=new_ast,
         student_subtree=state.student_tree,
         highlight=state.highlight,
@@ -238,7 +238,7 @@ def set_context(state, *args, **kwargs):
         out_sol = upd_sol
         out_stu = upd_stu
 
-    return state.to_child_state(
+    return state.to_child(
         student_context=out_stu, solution_context=out_sol, highlight=state.highlight
     )
 
@@ -279,7 +279,7 @@ def set_env(state, **kwargs):
     stu_new = stu_crnt.update(kwargs)
     sol_new = sol_crnt.update(kwargs)
 
-    return state.to_child_state(
+    return state.to_child(
         student_env=stu_new, solution_env=sol_new, highlight=state.highlight
     )
 
@@ -301,4 +301,4 @@ def disable_highlighting(state):
             Ex().check_function('round').disable_highlighting().check_args(0).has_equal_ast()
             Ex().check_function('round').check_args(0).disable_highlighting().has_equal_ast()
     """
-    return state.to_child_state(highlighting_disabled=True)
+    return state.to_child(highlighting_disabled=True)

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ def _test(state, incorrect_msg, exact_names, tv_name, highlight_name):`
`20`	`20`	`stu_vars = state.student_parts[tv_name]`
`21`	`21`	`sol_vars = state.solution_parts[tv_name]`
`22`	`22`
`23`		`- child_state = state.to_child_state(`
	`23`	`+ child_state = state.to_child(`
`24`	`24`	`student_subtree=state.student_parts.get(highlight_name),`
`25`	`25`	`solution_subtree=state.solution_parts.get(highlight_name),`
`26`	`26`	`)`