Improve imports

Author: hermansje

pythonwhat/checks/check_funcs.py

@@ -194,7 +194,7 @@ def with_context(state, *args, child=None):
         if isinstance(close_solution_context, Exception):
             raise InstructorError(
                 "error in the solution, closing the `with` fails with: %s"
-                % (close_solution_context)
+                % close_solution_context
             )
 
         close_student_context = breakDownNewEnvInProcess(process=state.student_process)

pythonwhat/sct_syntax.py

@@ -4,9 +4,7 @@
 from pythonwhat.probe import Node, Probe, TEST_NAMES
 from pythonwhat.utils import include_v1
 from pythonwhat import test_funcs
-from functools import partial, reduce, wraps
-import inspect
-import copy
+from functools import wraps
 
 # TODO: could define scts for check_wrappers at the module level
 ATTR_SCTS = scts.copy()

pythonwhat/tasks.py

@@ -298,9 +298,9 @@ def getResultFromProcess(res, tempname, process):
     """Get a value from process, return tuple of value, res if succesful"""
     if not isinstance(res, (UndefinedValue, Exception)):
         value = getRepresentation(tempname, process)
-        return (value, res)
+        return value, res
     else:
-        return (res, str(res))
+        return res, str(res)
 
 
 # decorator to automatically get value after running process task function
@@ -332,9 +332,9 @@ def get_output(f, process, shell, *args, **kwargs):
     out_str = out[0].strip()
     if not isinstance(res, Exception):
         toret = out_str or "no printouts"
-        return (toret, toret)
+        return toret, toret
     else:
-        return (res, str(res))
+        return res, str(res)
 
 
 @process_task

pythonwhat/test_funcs/utils.py

@@ -2,7 +2,6 @@
 
 from protowhat.Feedback import InstructorError
 from pythonwhat.Feedback import Feedback
-from protowhat.Test import Test
 from pythonwhat.Test import EqualTest
 from pythonwhat.checks.check_funcs import StubState
 from pythonwhat.checks.has_funcs import evalCalls

pythonwhat/utils_env.py

@@ -1,4 +1,3 @@
-import copy
 import ast
 
 

tests/test_author_warnings.py

@@ -1,6 +1,6 @@
 import pytest
 import ast
-from tests import helper
+import tests.helper as helper
 
 from pythonwhat.local import setup_state
 from protowhat.Feedback import InstructorError

tests/test_check_class_def.py

@@ -1,5 +1,5 @@
 import pytest
-from tests import helper
+import tests.helper as helper
 from pythonwhat.local import setup_state
 from pythonwhat.sct_syntax import v2_check_functions
 

tests/test_check_function.py

@@ -1,5 +1,5 @@
 import pytest
-from tests import helper
+import tests.helper as helper
 from pythonwhat.local import setup_state
 from protowhat.Test import TestFail as TF
 from protowhat.Feedback import InstructorError

tests/test_check_function_def.py

@@ -1,5 +1,5 @@
 import pytest
-from tests import helper
+import tests.helper as helper
 
 from pythonwhat.local import setup_state
 from pythonwhat.sct_syntax import v2_check_functions

tests/test_check_if_else.py

@@ -1,5 +1,5 @@
 import pytest
-from tests import helper
+import tests.helper as helper
 
 
 @pytest.mark.parametrize(