Move commands to their own directory.

test/AddCommandTest.py

@@ -17,8 +17,8 @@
 from datetime import date
 import unittest
 
-from topydo.lib import AddCommand
-from topydo.lib import ListCommand
+from topydo.commands import AddCommand
+from topydo.commands import ListCommand
 import CommandTest
 from topydo.lib.Config import config
 from topydo.lib import TodoList

test/AppendCommandTest.py

@@ -16,7 +16,7 @@
 
 import unittest
 
-from topydo.lib.AppendCommand import AppendCommand
+from topydo.commands.AppendCommand import AppendCommand
 import CommandTest
 from topydo.lib.TodoList import TodoList
 

test/ArchiveCommandTest.py

@@ -16,7 +16,7 @@
 
 import unittest
 
-from topydo.lib.ArchiveCommand import ArchiveCommand
+from topydo.commands.ArchiveCommand import ArchiveCommand
 import CommandTest
 import TestFacilities
 from topydo.lib.TodoList import TodoList

test/DeleteCommandTest.py

@@ -18,7 +18,7 @@ import unittest
 
 import CommandTest
 from topydo.lib.Config import config
-from topydo.lib.DeleteCommand import DeleteCommand
+from topydo.commands.DeleteCommand import DeleteCommand
 from topydo.lib.TodoList import TodoList
 from topydo.lib.TodoListBase import InvalidTodoException
 

test/DepCommandTest.py

@@ -17,7 +17,7 @@
 import unittest
 
 import CommandTest
-from topydo.lib.DepCommand import DepCommand
+from topydo.commands.DepCommand import DepCommand
 from topydo.lib.TodoList import TodoList
 
 class DepCommandTest(CommandTest.CommandTest):

test/DepriCommandTest.py

@@ -17,7 +17,7 @@
 import unittest
 
 import CommandTest
-from topydo.lib.DepriCommand import DepriCommand
+from topydo.commands.DepriCommand import DepriCommand
 from topydo.lib.TodoList import TodoList
 
 class DepriCommandTest(CommandTest.CommandTest):

test/DoCommandTest.py

@@ -18,7 +18,7 @@ from datetime import date, timedelta
 import unittest
 
 import CommandTest
-from topydo.lib.DoCommand import DoCommand
+from topydo.commands.DoCommand import DoCommand
 from topydo.lib.TodoList import TodoList
 
 def _yes_prompt(self):

test/IcalCommandTest.py

@@ -19,7 +19,7 @@ import unittest
 
 from topydo.lib.Config import config
 import CommandTest
-from topydo.lib.IcalCommand import IcalCommand
+from topydo.commands.IcalCommand import IcalCommand
 import TestFacilities
 
 class IcalCommandTest(CommandTest.CommandTest):

test/ListCommandTest.py

@@ -18,7 +18,7 @@ import unittest
 
 from topydo.lib.Config import config
 import CommandTest
-from topydo.lib.ListCommand import ListCommand
+from topydo.commands.ListCommand import ListCommand
 import TestFacilities
 
 class ListCommandTest(CommandTest.CommandTest):

test/ListContextCommandTest.py

@@ -18,7 +18,7 @@ import unittest
 
 import CommandTest
 import TestFacilities
-from topydo.lib.ListContextCommand import ListContextCommand
+from topydo.commands.ListContextCommand import ListContextCommand
 
 class ListContextCommandTest(CommandTest.CommandTest):
     def test_contexts1(self):

test/ListProjectCommandTest.py

@@ -18,7 +18,7 @@ import unittest
 
 import CommandTest
 import TestFacilities
-from topydo.lib.ListProjectCommand import ListProjectCommand
+from topydo.commands.ListProjectCommand import ListProjectCommand
 
 class ListProjectCommandTest(CommandTest.CommandTest):
     def test_projects1(self):

test/PostponeCommandTest.py

@@ -18,7 +18,7 @@ from datetime import date, timedelta
 import unittest
 
 import CommandTest
-from topydo.lib.PostponeCommand import PostponeCommand
+from topydo.commands.PostponeCommand import PostponeCommand
 from topydo.lib.TodoList import TodoList
 
 class PostponeCommandTest(CommandTest.CommandTest):

test/PriorityCommandTest.py

@@ -17,7 +17,7 @@
 import unittest
 
 import CommandTest
-from topydo.lib.PriorityCommand import PriorityCommand
+from topydo.commands.PriorityCommand import PriorityCommand
 from topydo.lib.TodoList import TodoList
 
 class PriorityCommandTest(CommandTest.CommandTest):

test/SortCommandTest.py

@@ -18,7 +18,7 @@ import unittest
 
 import CommandTest
 from topydo.lib.Config import config
-from topydo.lib.SortCommand import SortCommand
+from topydo.commands.SortCommand import SortCommand
 import TestFacilities
 
 class SortCommandTest(CommandTest.CommandTest):

test/TagCommandTest.py

@@ -17,7 +17,7 @@
 import unittest
 
 import CommandTest
-from topydo.lib.TagCommand import TagCommand
+from topydo.commands.TagCommand import TagCommand
 from topydo.lib.TodoList import TodoList
 
 class TagCommandTest(CommandTest.CommandTest):

topydo/lib/Commands.py → topydo/Commands.py

@@ -21,22 +21,22 @@ instance based on an argument list.
 
 from topydo.lib.Config import config
 
-from topydo.lib.AddCommand import AddCommand
-from topydo.lib.AppendCommand import AppendCommand
-from topydo.lib.DeleteCommand import DeleteCommand
-from topydo.lib.DepCommand import DepCommand
-from topydo.lib.DepriCommand import DepriCommand
-from topydo.lib.DoCommand import DoCommand
-from topydo.lib.EditCommand import EditCommand
-from topydo.lib.ExitCommand import ExitCommand
-from topydo.lib.IcalCommand import IcalCommand
-from topydo.lib.ListCommand import ListCommand
-from topydo.lib.ListContextCommand import ListContextCommand
-from topydo.lib.ListProjectCommand import ListProjectCommand
-from topydo.lib.PostponeCommand import PostponeCommand
-from topydo.lib.PriorityCommand import PriorityCommand
-from topydo.lib.SortCommand import SortCommand
-from topydo.lib.TagCommand import TagCommand
+from topydo.commands.AddCommand import AddCommand
+from topydo.commands.AppendCommand import AppendCommand
+from topydo.commands.DeleteCommand import DeleteCommand
+from topydo.commands.DepCommand import DepCommand
+from topydo.commands.DepriCommand import DepriCommand
+from topydo.commands.DoCommand import DoCommand
+from topydo.commands.EditCommand import EditCommand
+from topydo.commands.ExitCommand import ExitCommand
+from topydo.commands.IcalCommand import IcalCommand
+from topydo.commands.ListCommand import ListCommand
+from topydo.commands.ListContextCommand import ListContextCommand
+from topydo.commands.ListProjectCommand import ListProjectCommand
+from topydo.commands.PostponeCommand import PostponeCommand
+from topydo.commands.PriorityCommand import PriorityCommand
+from topydo.commands.SortCommand import SortCommand
+from topydo.commands.TagCommand import TagCommand
 
 _SUBCOMMAND_MAP = {
   'add': AddCommand,

topydo/cli/CLI.py

@@ -31,7 +31,7 @@ except ConfigError as config_error:
     error(str(config_error))
     sys.exit(1)
 
-from topydo.lib.Commands import get_subcommand
+from topydo.Commands import get_subcommand
 from topydo.lib import TodoList
 
 class CLIApplication(CLIApplicationBase):

topydo/cli/CLIApplicationBase.py

@@ -85,8 +85,8 @@ except ConfigError as config_error:
     error(str(config_error))
     sys.exit(1)
 
-from topydo.lib.ArchiveCommand import ArchiveCommand
-from topydo.lib.SortCommand import SortCommand
+from topydo.commands.ArchiveCommand import ArchiveCommand
+from topydo.commands.SortCommand import SortCommand
 from topydo.lib import TodoFile
 from topydo.lib import TodoList
 from topydo.lib import TodoListBase

topydo/cli/Prompt.py

@@ -32,8 +32,8 @@ except ConfigError as config_error:
     error(str(config_error))
     sys.exit(1)
 
-from topydo.lib.Commands import get_subcommand
-from topydo.lib.SortCommand import SortCommand
+from topydo.Commands import get_subcommand
+from topydo.commands.SortCommand import SortCommand
 from topydo.lib import TodoFile
 from topydo.lib import TodoList
 

topydo/lib/DeleteCommand.py → topydo/commands/DeleteCommand.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from topydo.lib.DCommand import DCommand
+from topydo.commands.DCommand import DCommand
 
 class DeleteCommand(DCommand):
     def __init__(self, p_args, p_todolist,

topydo/lib/DoCommand.py → topydo/commands/DoCommand.py

@@ -16,7 +16,7 @@
 
 from datetime import date
 
-from topydo.lib.DCommand import DCommand
+from topydo.commands.DCommand import DCommand
 from topydo.lib.PrettyPrinter import PrettyPrinter
 from topydo.lib.PrettyPrinterFilter import PrettyPrinterNumbers
 from topydo.lib.Recurrence import advance_recurring_todo, strict_advance_recurring_todo, NoRecurrenceException

topydo/lib/EditCommand.py → topydo/commands/EditCommand.py

@@ -18,7 +18,7 @@ import os
 from subprocess import call, check_call, CalledProcessError
 import tempfile
 
-from topydo.lib.ListCommand import ListCommand
+from topydo.commands.ListCommand import ListCommand
 from topydo.lib.MultiCommand import MultiCommand
 from topydo.lib.Config import config
 from topydo.lib.Todo import Todo

topydo/lib/IcalCommand.py → topydo/commands/IcalCommand.py

@@ -19,7 +19,7 @@ Implements a subcommand that outputs an iCalendar file.
 """
 
 from topydo.lib.IcalPrinter import IcalPrinter
-from topydo.lib.ListCommand import ListCommand
+from topydo.commands.ListCommand import ListCommand
 
 class IcalCommand(ListCommand):
     def __init__(self, p_args, p_todolist,