Improve state partial with offset

Author: hermansje

pythonwhat/State.py

@@ -6,6 +6,7 @@
     parser_dict,
 )
 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
@@ -253,7 +254,7 @@ def get_dispatcher(self):
         return Dispatcher(self.pre_exercise_ast)
 
 
-class Dispatcher:
+class Dispatcher(DispatcherInterface):
     def __init__(self, pre_exercise_ast):
         self._parser_cache = dict()
         self.pre_exercise_mappings = self._getx(

pythonwhat/checks/check_wrappers.py

@@ -667,46 +667,51 @@ def __init__(self, i):
 #     return full_partial
 
 
-def partial_with_offset(func, *partial_args, offset=1, **partial_kwargs):
-    kwargs_partial = partial(func, **partial_kwargs)
+def partial_with_offset(offset=1):
+    def bound_partial_with_offset(func, *partial_args, **partial_kwargs):
+        kwargs_partial = partial(func, **partial_kwargs)
 
-    @wraps(func)
-    def full_partial(*args, **kwargs):
-        full_args = args[:offset] + partial_args + args[offset:]
-        return kwargs_partial(*full_args, **kwargs)
+        @wraps(func)
+        def full_partial(*args, **kwargs):
+            full_args = args[:offset] + partial_args + args[offset:]
+            return kwargs_partial(*full_args, **kwargs)
 
-    return full_partial
+        return full_partial
+    return bound_partial_with_offset
+
+
+state_partial = partial_with_offset()
 
 
 def rename_function(func, name):
     # see functools.wraps
     func.__name__ = func.__qualname__ = name
 
 
-scts["has_equal_name"] = partial_with_offset(
+scts["has_equal_name"] = state_partial(
     has_equal_part,
     "name",
     msg="Make sure to use the correct {{name}}, was expecting {{sol_part[name]}}, instead got {{stu_part[name]}}.",
 )
-scts["is_default"] = partial_with_offset(
+scts["is_default"] = state_partial(
     has_equal_part,
     "is_default",
     msg="Make sure it {{ 'has' if sol_part.is_default else 'does not have'}} a default argument.",
 )
 
 # include rest of wrappers
 for k, v in __PART_WRAPPERS__.items():
-    check_fun = partial_with_offset(check_part, k, v)
+    check_fun = state_partial(check_part, k, v)
     rename_function(check_fun, "check_" + k)
     scts[check_fun.__name__] = check_fun
 
 for k, v in __PART_INDEX_WRAPPERS__.items():
-    check_fun = partial_with_offset(check_part_index, k, part_msg=v)
+    check_fun = state_partial(check_part_index, k, part_msg=v)
     rename_function(check_fun, "check_" + k)
     scts[check_fun.__name__] = check_fun
 
 for k, v in __NODE_WRAPPERS__.items():
-    check_fun = partial_with_offset(check_node, k + "s", typestr=v["typestr"])
+    check_fun = state_partial(check_node, k + "s", typestr=v["typestr"])
     check_fun.__doc__ = Template(v["docstr"]).render(
         typestr="typestr: If specified, this overrides the standard way of referring to the construct you're zooming in on.",
         missing_msg="missing_msg: If specified, this overrides the automatically generated feedback message in case the construct could not be found.",

pythonwhat/probe.py

@@ -5,7 +5,7 @@
 from collections import OrderedDict
 from pythonwhat import test_funcs
 from pythonwhat.State import State
-from pythonwhat.checks.check_wrappers import partial_with_offset
+from pythonwhat.checks.check_wrappers import state_partial
 
 TEST_NAMES = [
     "test_mc",
@@ -121,7 +121,7 @@ def __iter__(self):
     def partial(self):
         """Return partial of original function call"""
         ba = self.data["bound_args"]
-        return partial_with_offset(self.data["func"], *ba.args[1:], **ba.kwargs)
+        return state_partial(self.data["func"], *ba.args[1:], **ba.kwargs)
 
     def update_child_calls(self):
         """Replace child nodes on original function call with their partials"""