Re-enable prospector hook and fix reported issues

Author: idle-code

.idea/dictionaries/idlecode.xml

@@ -8,16 +8,6 @@ repos:
       - id: debug-statements
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: master
-    hooks:
-      - id: mypy
-        files: 'contextshell|tests'
-#  - repo: https://github.com/guykisel/prospector-mirror
-#    rev: master
-#    hooks:
-#      - id: prospector
-#        exclude: "tests"
   - repo: https://github.com/asottile/pyupgrade
     rev: master
     hooks:
@@ -28,6 +18,9 @@ repos:
     rev: master
     hooks:
       - id: isort
+        args:
+          - --multi-line=3
+          - --keep-direct-and-as
   - repo: https://github.com/ambv/black
     rev: master
     hooks:
@@ -36,3 +29,13 @@ repos:
         args:
           - -l 100
           - --py36
+  - repo: https://github.com/guykisel/prospector-mirror
+    rev: master
+    hooks:
+      - id: prospector
+        exclude: "tests"
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: master
+    hooks:
+      - id: mypy
+        files: 'contextshell|tests'

.pre-commit-config.yaml

@@ -525,7 +525,7 @@ max-locals=10
 max-parents=5
 
 # Maximum number of public methods for a class (see R0904).
-max-public-methods=20
+max-public-methods=30
 
 # Maximum number of return / yield for function / method body.
 max-returns=6

.pylintrc

@@ -4,6 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
+pre-commit = "*"
 
 [dev-packages]
 mypy = "*"

Pipfile

@@ -10,7 +10,7 @@
 KeywordArguments = Dict[str, ArgumentValue]
 
 
-class Action(ABC):  # pylint: disable=too-few-public-methods
+class Action(ABC):
     def __init__(self, name: NodePath) -> None:
         assert isinstance(name, NodePath)
         assert name.is_relative
@@ -87,23 +87,6 @@ def pack_argument_tree(*args: PositionalArguments, **kwargs: KeywordArguments) -
     return OrderedDict(pack_list)
 
 
-def parse_argument_tree(raw_arguments: List[str]) -> ActionArgsPack:
-    from contextshell.command import convert_token_type
-
-    pack_list: List[Tuple[Union[NodePath, int], ArgumentValue]] = []
-    for i, arg in enumerate(raw_arguments):
-        if isinstance(arg, str) and "=" in arg:
-            key, value = arg.split("=")
-            key_path = NodePath.from_python_name(key)
-            if key_path.is_absolute:
-                raise ValueError(f"Named argument path must be relative - {key_path}")
-            typed_value = convert_token_type(value)
-            pack_list.append((key_path, typed_value))
-        else:
-            pack_list.append((i, arg))
-    return OrderedDict(pack_list)
-
-
 class BuiltinExecutor(ActionExecutor):
     """Manages built-in, global action registry"""
 

Pipfile.lock

@@ -8,12 +8,7 @@ class Node:
     def __init__(self, value=None):
         self._value = value
         self._subnodes = []  # TODO: use OrderedDict?
-        self._parent = None
-
-    @property
-    def parent(self) -> "Node":
-        """Return parent of this node"""
-        return self._parent
+        self.parent = None
 
     def get(self):
         """Get value stored in this node"""
@@ -46,7 +41,7 @@ def append(self, node: "Node", name: str = None):
                 raise NameError("Invalid appended node name - empty")
             if self.get_node(name) is not None:
                 raise NameError(f"Node '{name}' already exists")
-        node._parent = self
+        node.parent = self
         self._subnodes.append((name, node))
 
     def get_node(self, name: str = None, index: int = None) -> Optional["Node"]:
@@ -78,7 +73,7 @@ def remove(self, name: str = None, index: int = None) -> "Node":
         if node_to_remove is None:
             raise NameError(f"Node '{name}' doesn't exists")
         self._subnodes = [p for p in self._subnodes if p[1] is not node_to_remove]
-        node_to_remove._parent = None
+        node_to_remove.parent = None
         return node_to_remove
 
     def contains(self, name: str = None, index: int = None) -> bool:
@@ -94,7 +89,7 @@ class NodeTreeRoot(ActionExecutor):
     """Frontend to the (passive) node-based data storage"""
 
     def __init__(self):
-        self.root = self.create_node(None)
+        self.root = Node(None)
         self.install_default_actions()
 
     def create_action(self, target: NodePath, path: str, value=None):  # NOCOVER
@@ -198,12 +193,9 @@ def find_type(self, target: NodePath, type_name: NodePath):  # TODO: add type-hi
             return None
         return type_node.get()
 
-    def create_node(self, value):
-        return Node(value)
-
     def create(self, path: NodePath, initial_value=None):
         parent = self._create_path(path.base_path)
-        new_node = self.create_node(initial_value)
+        new_node = Node(initial_value)
         parent.append(new_node, path.base_name)
 
     def contains(self, path: NodePath) -> bool:
@@ -258,6 +250,6 @@ def _create_path(self, path: NodePath, root: Node = None) -> Node:
 
         next_branch_name = path[0]
         if not root.contains(next_branch_name):
-            new_node = self.create_node(None)
+            new_node = Node(None)
             root.append(new_node, next_branch_name)
         return self._create_path(NodePath.cast(path[1:]), root.get_node(next_branch_name))

contextshell/action.py

@@ -1,7 +1,8 @@
-from typing import List, Optional
+from collections.__init__ import OrderedDict
+from typing import List, Optional, Tuple, Union
 
-from contextshell.action import ActionExecutor, parse_argument_tree
-from contextshell.path import NodePath
+from .action import ActionArgsPack, ActionExecutor, ArgumentValue
+from .path import NodePath
 
 
 class Command:
@@ -131,3 +132,18 @@ def _parse_scope(self, token_iterator) -> Command:
             cmd = Command(parts[0])
             cmd.arguments = parts[1:]
         return cmd
+
+
+def parse_argument_tree(raw_arguments: List[str]) -> ActionArgsPack:
+    pack_list: List[Tuple[Union[NodePath, int], ArgumentValue]] = []
+    for i, arg in enumerate(raw_arguments):
+        if isinstance(arg, str) and "=" in arg:
+            key, value = arg.split("=")
+            key_path = NodePath.from_python_name(key)
+            if key_path.is_absolute:
+                raise ValueError(f"Named argument path must be relative - {key_path}")
+            typed_value = convert_token_type(value)
+            pack_list.append((key_path, typed_value))
+        else:
+            pack_list.append((i, arg))
+    return OrderedDict(pack_list)