Improve coverage; remove unused imports

Author: idle-code

.coveragerc

@@ -3,8 +3,7 @@ branch = True
 
 [report]
 exclude_lines =
-	pragma: no cover
-
+	NOCOVER
 	raise NotImplementedError
 	assert
 	if __name__ == .__main__.:

contextshell/Action.py

@@ -1,7 +1,6 @@
 from abc import ABC, abstractmethod
 from contextshell.NodePath import NodePath
 from contextshell.TreeRoot import ActionArgsPack
-from typing import Dict, Union, Any
 
 
 class Action(ABC):

contextshell/CallableAction.py

@@ -1,5 +1,4 @@
-from collections import OrderedDict
-from typing import Callable, Dict, Union, Any, Tuple, List
+from typing import Callable
 from contextshell.TreeRoot import unpack_argument_tree, ActionArgsPack
 from contextshell.Action import Action
 from contextshell.NodePath import NodePath
@@ -16,9 +15,9 @@ def invoke(self, target: NodePath, action: NodePath, arguments: ActionArgsPack):
         return self.implementation(target, *args, **kwargs)
 
 
-def action_from_function(method_to_wrap: Callable) -> Action:
-    action_name: str = method_to_wrap.__name__
+def action_from_function(function_to_wrap: Callable) -> Action:
+    action_name: str = function_to_wrap.__name__
     if action_name.endswith('_action'):
         action_name = action_name[:-len('_action')]
-    action_name = action_name.replace('_', '.')
-    return CallableAction(method_to_wrap, NodePath(action_name))
+    action_path = NodePath.from_python_name(action_name)
+    return CallableAction(function_to_wrap, action_path)

contextshell/CommandInterpreter.py

@@ -1,7 +1,6 @@
 from contextshell.Command import Command
 from contextshell.NodePath import NodePath
 from contextshell.TreeRoot import TreeRoot, parse_argument_tree
-from typing import Dict, Union, Any
 
 
 class CommandInterpreter:

contextshell/NodeTreeRoot.py

@@ -3,7 +3,7 @@
 from contextshell.TreeRoot import TreeRoot, ActionArgsPack
 from contextshell.Action import Action
 from contextshell.CallableAction import action_from_function
-from typing import Callable, List, Optional, Dict, Union, Any
+from typing import List, Optional
 
 
 # CHECK: how to implement TemporaryTreeRoot (based on NodeTreeRoot)
@@ -13,35 +13,35 @@ def __init__(self):
         self.root = self.create_node(None)
         self.install_default_actions()
 
-    def create_action(self, target: NodePath, path: str, value=None):
+    def create_action(self, target: NodePath, path: str, value=None):  # NOCOVER
         self.create(NodePath.join(target, path), value)
 
-    def exists_action(self, target: NodePath, path: str) -> bool:
+    def exists_action(self, target: NodePath, path: str) -> bool:  # NOCOVER
         return self.exists(NodePath.join(target, path))
 
-    def get_action(self, target: NodePath):
+    def get_action(self, target: NodePath):  # NOCOVER
         return self.get(target)
 
-    def set_action(self, target: NodePath, new_value):
+    def set_action(self, target: NodePath, new_value):  # NOCOVER
         return self.set(target, new_value)
 
-    def list_action(self, target: NodePath):
+    def list_action(self, target: NodePath):  # NOCOVER
         all_list = self.list(target)
         return list(filter(lambda p: not self.is_attribute(p), all_list))
 
-    def list_all_action(self, target: NodePath):
+    def list_all_action(self, target: NodePath):  # NOCOVER
         return self.list(target)
 
-    def list_attributes_action(self, target: NodePath):
+    def list_attributes_action(self, target: NodePath):  # NOCOVER
         all_list = self.list(target)
         return list(filter(self.is_attribute, all_list))
 
-    def list_actions_action(self, target: NodePath):
+    def list_actions_action(self, target: NodePath):  # NOCOVER
         # FIXME: use the same mechanism as in self.find_action
         actions_branch = NodePath.join(target, '@actions')
         return self.list(actions_branch)
 
-    def remove_action(self, target: NodePath):
+    def remove_action(self, target: NodePath):  # NOCOVER
         # CHECK: use 'path' argument?
         return self.remove(target)
 
@@ -89,7 +89,7 @@ def _is_action_implementation(self, node_value) -> bool:
     # def install_type(self, type: NodeType):
     #     raise NotImplementedError()
 
-    def is_attribute(self, path: str): # FIXME: is used?
+    def is_attribute(self, path: str): # CHECK: is used?
         return path.startswith('@')
 
     def list_actions(self, path: NodePath) -> List[NodePath]:

tests/functional/CrudTests.py

@@ -1,8 +1,5 @@
-from contextshell.NodeTreeRoot import NodeTreeRoot
-from contextshell.NodePath import NodePath
 from tests.functional.ShellTestsBase import NodeTreeTestsBase
 from tests.functional.TestExecutor import script_test
-import unittest
 
 
 class CrudTestsBase(NodeTreeTestsBase):

tests/unit/Fakes.py

@@ -1,7 +1,7 @@
 from contextshell.NodePath import NodePath
 from contextshell.Action import Action
-from typing import Dict, Callable, Union, Any
-from contextshell.TreeRoot import TreeRoot, ActionArgsPack
+from typing import Dict
+from contextshell.TreeRoot import ActionArgsPack
 
 
 class FakeTree:

tests/unit/NodePathTests.py

@@ -190,8 +190,8 @@ def test_basename_from_empty(self):
 
 class IsParentOfTests(unittest.TestCase):
     def test_is_parent_of(self):
-        foo = NodePath.cast('.foo')
-        foobar = NodePath.cast('.foo.bar')
+        foo = create_path('.foo')
+        foobar = create_path('.foo.bar')
         self.assertTrue(foo.is_parent_of(foobar))
         self.assertFalse(foobar.is_parent_of(foo))
 

tests/unit/NodeTreeRootTests.py

@@ -1,9 +1,6 @@
 import unittest
-from typing import Dict, Union, Any
 from tests.unit.Fakes import FakeAction
 from contextshell.NodePath import NodePath as np
-from contextshell.NodePath import NodePath
-from contextshell.TreeRoot import TreeRoot
 
 
 def create_tree(*args, **kwargs):