Changed filesystem project structure to reflect more common approach

idle-code · idle-code · commit bb9cace87003 · 2017-08-15T09:18:24.000+02:00
diff --git a/contextshell/ActionNode.py b/contextshell/ActionNode.py
@@ -1,5 +1,5 @@
-from Node import Node
-from NodePath import NodePath
+from contextshell.NodePath import NodePath
+from contextshell.Node import Node
 
 
 class ActionNode(Node):
diff --git a/contextshell/Command.py b/contextshell/Command.py
diff --git a/contextshell/CommandInterpreter.py b/contextshell/CommandInterpreter.py
@@ -1,6 +1,7 @@
-from Command import Command
-from NodePath import NodePath
-from Session import Session
+from contextshell.Command import Command
+from contextshell.Session import Session
+
+from contextshell.NodePath import NodePath
 
 
 class CommandInterpreter:
diff --git a/contextshell/CommandParser.py b/contextshell/CommandParser.py
@@ -1,4 +1,4 @@
-from Command import Command
+from contextshell.Command import Command
 
 
 def tokenize(text: str) -> [str]:
diff --git a/contextshell/Node.py b/contextshell/Node.py
diff --git a/contextshell/NodePath.py b/contextshell/NodePath.py
@@ -32,7 +32,7 @@ def create_path(root, path):
             return root
         node = root.get_node(name=path[0])
         if node is None:
-            from Node import Node  # TODO: move to the header when Node2 replaces Node
+            from contextshell.Node import Node  # TODO: move to the header when Node2 replaces Node
             node = Node()
             root.append(node, path[0])
         return NodePath.create_path(node, path[1:])
diff --git a/contextshell/Session.py b/contextshell/Session.py
@@ -1,4 +1,4 @@
-from NodePath import NodePath
+from contextshell.NodePath import NodePath
 
 
 class Session:
diff --git a/contextshell/Shell.py b/contextshell/Shell.py
@@ -1,7 +1,8 @@
-from Session import *
-from NodePath import *
-from CommandParser import CommandParser
-from CommandInterpreter import CommandInterpreter
+from contextshell.CommandInterpreter import CommandInterpreter
+from contextshell.CommandParser import CommandParser
+from contextshell.Session import *
+
+from contextshell.NodePath import *
 
 
 class Shell:
diff --git a/contextshell/TreeRoot.py b/contextshell/TreeRoot.py
@@ -1,5 +1,6 @@
-from Session import Session
-from actions.BasicActions import *
+from contextshell.Session import Session
+
+from contextshell.actions.BasicActions import *
 
 
 class TreeRoot(Session):
diff --git a/contextshell/__init__.py b/contextshell/__init__.py
diff --git a/contextshell/actions/BasicActions.py b/contextshell/actions/BasicActions.py
@@ -1,4 +1,4 @@
-from ActionNode import *
+from contextshell.ActionNode import *
 
 
 class GetAction(ActionNode):
diff --git a/contextshell/actions/__init__.py b/contextshell/actions/__init__.py
diff --git a/repl.py b/repl.py
@@ -1,8 +1,9 @@
 #!/usr/bin/python3
-from TreeRoot import *
-from Shell import *
 import readline
 
+from TreeRoot import *
+
+from contextshell.Shell import *
 
 if __name__ == '__main__':
     tree = TreeRoot()
diff --git a/script.py b/script.py
@@ -1,8 +1,9 @@
 #!/usr/bin/python3
+import sys
+
 from TreeRoot import *
-from Shell import *
 
-import sys
+from contextshell.Shell import *
 
 if len(sys.argv) < 2:
     raise ValueError('Script requires single argument')
diff --git a/single_test b/single_test
diff --git a/test_script b/test_script
diff --git a/tests/ActionNodeTests.py b/tests/ActionNodeTests.py
@@ -1,7 +1,7 @@
 import unittest
+from contextshell.NodePath import NodePath
 
-from ActionNode import *
-from NodePath import NodePath
+from contextshell.ActionNode import *
 
 
 def sum_function(target: Node, number: int):
diff --git a/tests/CommandInterpreterTests.py b/tests/CommandInterpreterTests.py
@@ -1,7 +1,8 @@
 import unittest
-from CommandInterpreter import CommandInterpreter
-from Command import Command
-from TreeRoot import TreeRoot
+
+from contextshell.Command import Command
+from contextshell.TreeRoot import TreeRoot
+from contextshell.CommandInterpreter import CommandInterpreter
 
 
 class CommandInterpreterTests(unittest.TestCase):
diff --git a/tests/CommandParserTests.py b/tests/CommandParserTests.py
@@ -1,11 +1,12 @@
 import unittest
-from CommandParser import CommandParser
-from Command import Command
+
+from contextshell.Command import Command
+from contextshell.CommandParser import CommandParser
 
 
 class CommandTokenizerTests(unittest.TestCase):
     def tok_test(self, text: str, expected_tokens: list):
-        from CommandParser import tokenize
+        from contextshell.CommandParser import tokenize
         self.assertListEqual(expected_tokens, tokenize(text))
 
     def test_empty(self):
diff --git a/tests/CommandTests.py b/tests/CommandTests.py
@@ -1,5 +1,6 @@
 import unittest
-from Command import Command
+
+from contextshell.Command import Command
 
 
 class CommandTests(unittest.TestCase):
diff --git a/tests/NodePathTests.py b/tests/NodePathTests.py
@@ -1,8 +1,8 @@
-from NodePath import *
-from Node import *
-
 import unittest
 
+from contextshell.NodePath import *
+from contextshell.Node import *
+
 
 class NodePathTests(unittest.TestCase):
     def test_empty(self):
diff --git a/tests/NodeTests.py b/tests/NodeTests.py
@@ -1,5 +1,6 @@
 import unittest
-from Node import Node
+
+from contextshell.Node import Node
 
 
 class ValueTests(unittest.TestCase):
diff --git a/tests/ShellTests.py b/tests/ShellTests.py
@@ -1,6 +1,8 @@
 import unittest
-from Shell import *
-from TreeRoot import TreeRoot
+
+from contextshell.TreeRoot import TreeRoot
+
+from contextshell.Shell import *
 
 
 class ShellTests(unittest.TestCase):
diff --git a/tests/TemporarySession.py b/tests/TemporarySession.py
@@ -1,5 +1,5 @@
-from Node import Node
-from Session import *
+from contextshell.Session import *
+from contextshell.Node import Node
 
 
 class TemporarySession(Session):
diff --git a/tests/TemporarySessionTests.py b/tests/TemporarySessionTests.py
@@ -1,7 +1,7 @@
 import unittest
 
-from TreeRoot import TreeRoot
 from TemporarySession import *
+from contextshell.TreeRoot import TreeRoot
 
 
 class TemporarySessionTests(unittest.TestCase):
diff --git a/tests/TreeRootTests.py b/tests/TreeRootTests.py
@@ -1,7 +1,7 @@
 import unittest
 
-from TreeRoot import TreeRoot
-from NodePath import NodePath
+from contextshell.NodePath import NodePath
+from contextshell.TreeRoot import TreeRoot
 
 
 class SessionTests(unittest.TestCase):
@@ -107,13 +107,13 @@ def test_install_action_none(self):
             self.tree.install_action(None)
 
     def test_install_action(self):
-        from ActionNode import ActionNode
+        from contextshell.ActionNode import ActionNode
         action = ActionNode('act', lambda x: x)
         self.tree.install_action(action)
         self.assertIsNotNone(TreeRoot._find_action(self.tree.root, 'act'))
 
     def test_install_action_nested(self):
-        from ActionNode import ActionNode
+        from contextshell.ActionNode import ActionNode
         action = ActionNode('foo.bar', lambda x: x)
         self.tree.install_action(action)
         self.assertIsNotNone(TreeRoot._find_action(self.tree.root, 'foo.bar'))
diff --git a/tests/actions/CreateActionTests.py b/tests/actions/CreateActionTests.py
@@ -1,8 +1,8 @@
 import unittest
 
-from Node import Node
-from NodePath import NodePath
-from actions.BasicActions import CreateAction
+from contextshell.NodePath import NodePath
+from contextshell.actions.BasicActions import CreateAction
+from contextshell.Node import Node
 
 
 class CreateActionTests(unittest.TestCase):
diff --git a/tests/actions/ExistsActionTests.py b/tests/actions/ExistsActionTests.py
@@ -1,8 +1,8 @@
 import unittest
 
-from Node import Node
-from NodePath import NodePath
-from actions.BasicActions import ExistsAction
+from contextshell.NodePath import NodePath
+from contextshell.actions.BasicActions import ExistsAction
+from contextshell.Node import Node
 
 
 class ExistsActionTests(unittest.TestCase):
diff --git a/tests/actions/GetActionTests.py b/tests/actions/GetActionTests.py
@@ -1,8 +1,8 @@
 import unittest
 
-from Node import Node
-from NodePath import NodePath
-from actions.BasicActions import GetAction
+from contextshell.NodePath import NodePath
+from contextshell.actions.BasicActions import GetAction
+from contextshell.Node import Node
 
 
 class GetActionTests(unittest.TestCase):
diff --git a/tests/actions/ListActionTests.py b/tests/actions/ListActionTests.py
@@ -1,8 +1,8 @@
 import unittest
 
-from Node import Node
-from NodePath import NodePath
-from actions.BasicActions import ListAction
+from contextshell.NodePath import NodePath
+from contextshell.actions.BasicActions import ListAction
+from contextshell.Node import Node
 
 
 class ListActionTests(unittest.TestCase):
diff --git a/tests/actions/RemoveActionTests.py b/tests/actions/RemoveActionTests.py
@@ -1,8 +1,9 @@
 import unittest
 
-from Node import Node
-from NodePath import NodePath
-from actions.BasicActions import RemoveAction
+from contextshell.NodePath import NodePath
+from contextshell.actions.BasicActions import RemoveAction
+
+from contextshell.Node import Node
 
 
 class RemoveActionTests(unittest.TestCase):
diff --git a/tests/actions/SetActionTests.py b/tests/actions/SetActionTests.py
@@ -1,8 +1,9 @@
 import unittest
 
-from Node import Node
-from NodePath import NodePath
-from actions.BasicActions import SetAction
+from contextshell.NodePath import NodePath
+from contextshell.actions.BasicActions import SetAction
+
+from contextshell.Node import Node
 
 
 class SetActionTests(unittest.TestCase):
diff --git a/tests/actions/__init__.py b/tests/actions/__init__.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from Command import Command`
	`1`	`+from contextshell.Command import Command`
`2`	`2`
`3`	`3`
`4`	`4`	`def tokenize(text: str) -> [str]:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from NodePath import NodePath`
	`1`	`+from contextshell.NodePath import NodePath`
`2`	`2`
`3`	`3`
`4`	`4`	`class Session:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from ActionNode import *`
	`1`	`+from contextshell.ActionNode import *`
`2`	`2`
`3`	`3`
`4`	`4`	`class GetAction(ActionNode):`