Clean up code

protowhat/checks/check_funcs.py

@@ -1,5 +1,4 @@
 from functools import partial, wraps
-import copy
 
 from protowhat.Feedback import Feedback
 

protowhat/sct_syntax.py

@@ -79,14 +79,16 @@ def __init__(self, stack=None, attr_scts=None):
         self._attr_scts = {} if attr_scts is None else attr_scts
 
     def __call__(self, *args, **kwargs):
-        if not self._crnt_sct:
+        if self._crnt_sct:
+            # calling an SCT function (after attribute access)
+            call_data = (self._crnt_sct, args, kwargs)
+            return self.__class__(self._stack + [call_data], self._attr_scts)
+        else:
+            # running the chain
             state = kwargs.get("state") or args[0]
             return reduce(
                 lambda s, cd: self._call_from_data(s, *cd), self._stack, state
             )
-        else:
-            call_data = (self._crnt_sct, args, kwargs)
-            return self.__class__(self._stack + [call_data], self._attr_scts)
 
     @staticmethod
     def _call_from_data(state, f, args, kwargs):
@@ -145,9 +147,11 @@ def create_sct_context(State, sct_dict, root_state=None):
     state_dec = state_dec_gen(State, sct_dict)
     sct_ctx = {k: state_dec(v) for k, v in sct_dict.items()}
 
-    ctx = {**sct_ctx}
-    ctx["state_dec"] = state_dec  # needed by ext packages
-    ctx["Ex"] = ExGen(root_state, sct_ctx)
-    ctx["F"] = partial(F, attr_scts=sct_ctx)
+    ctx = {
+        **sct_ctx,
+        "state_dec": state_dec,  # needed by ext packages
+        "Ex": ExGen(root_state, sct_ctx),
+        "F": partial(F, attr_scts=sct_ctx),
+    }
 
     return ctx

tests/test_check_files.py

@@ -68,7 +68,7 @@ def test_check_file_use_fs_no_parse(state, tf):
 
 def test_check_no_sol(state, tf):
     child = cf.check_file(state, tf.name, use_fs = True)
-    assert child.solution_code == None
+    assert child.solution_code is None
 
 def test_check_dir(state):
     with TemporaryDirectory() as td:

tests/test_selectors.py

@@ -1,7 +1,5 @@
 from protowhat.selectors import Selector
 
-import pytest
-
 
 def test_selector_standalone():
     # use python's builtin ast library