Merge remote-tracking branch 'origin/dot' into dot/master

test/facilities.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.PrettyPrinter import PrettyPrinter
+from topydo.lib.printers.PrettyPrinter import PrettyPrinter
 from topydo.lib.Todo import Todo
 from topydo.lib.TodoFile import TodoFile
 from topydo.lib.TodoList import TodoList

test/test_json_printer.py

@@ -17,7 +17,7 @@
 import unittest
 
 from test.topydo_testcase import TopydoTest
-from topydo.lib.JsonPrinter import JsonPrinter
+from topydo.lib.printers.Json import JsonPrinter
 from topydo.lib.Todo import Todo
 
 

topydo/commands/DepCommand.py

@@ -17,8 +17,8 @@
 from topydo.lib import Filter
 from topydo.lib.Command import Command, InvalidCommandArgument
 from topydo.lib.Config import config
-from topydo.lib.DotPrinter import DotPrinter
-from topydo.lib.PrettyPrinter import pretty_printer_factory
+from topydo.lib.printers.Dot import DotPrinter
+from topydo.lib.printers.PrettyPrinter import pretty_printer_factory
 from topydo.lib.Sorter import Sorter
 from topydo.lib.TodoListBase import InvalidTodoException
 from topydo.lib.View import View

topydo/commands/DoCommand.py

@@ -17,7 +17,7 @@
 from datetime import date
 
 from topydo.lib.DCommand import DCommand
-from topydo.lib.PrettyPrinter import PrettyPrinter
+from topydo.lib.printers.PrettyPrinter import PrettyPrinter
 from topydo.lib.prettyprinters.Numbers import PrettyPrinterNumbers
 from topydo.lib.Recurrence import NoRecurrenceException, advance_recurring_todo
 from topydo.lib.RelativeDate import relative_date_to_date

topydo/commands/ListCommand.py

@@ -17,7 +17,7 @@
 from topydo.lib.Config import config
 from topydo.lib.ExpressionCommand import ExpressionCommand
 from topydo.lib.Filter import InstanceFilter
-from topydo.lib.PrettyPrinter import pretty_printer_factory
+from topydo.lib.printers.PrettyPrinter import pretty_printer_factory
 from topydo.lib.prettyprinters.Format import PrettyPrinterFormatFilter
 from topydo.lib.TodoListBase import InvalidTodoException
 
@@ -59,18 +59,18 @@ class ListCommand(ExpressionCommand):
                 self.sort_expression = value
             elif opt == '-f':
                 if value == 'json':
-                    from topydo.lib.JsonPrinter import JsonPrinter
+                    from topydo.lib.printers.Json import JsonPrinter
                     self.printer = JsonPrinter()
                 elif value == 'ical':
                     if self._poke_icalendar():
-                        from topydo.lib.IcalPrinter import IcalPrinter
+                        from topydo.lib.printers.Ical import IcalPrinter
                         self.printer = IcalPrinter(self.todolist)
 
                         # a graph without dependencies is not so useful, hence
                         # show all
                         self.show_all = True
                 elif value == 'dot':
-                    from topydo.lib.DotPrinter import DotPrinter
+                    from topydo.lib.printers.Dot import DotPrinter
                     self.printer = DotPrinter(self.todolist)
                 else:
                     self.printer = None

topydo/lib/Command.py

@@ -16,7 +16,7 @@
 
 import getopt
 
-from topydo.lib.PrettyPrinter import PrettyPrinter
+from topydo.lib.printers.PrettyPrinter import PrettyPrinter
 
 
 class InvalidCommandArgument(Exception):

topydo/lib/DCommand.py

@@ -17,7 +17,7 @@
 import re
 
 from topydo.lib.MultiCommand import MultiCommand
-from topydo.lib.PrettyPrinter import PrettyPrinter
+from topydo.lib.printers.PrettyPrinter import PrettyPrinter
 from topydo.lib.prettyprinters.Numbers import PrettyPrinterNumbers
 
 

topydo/lib/TodoListBase.py

@@ -24,7 +24,7 @@ from datetime import date
 from topydo.lib import Filter
 from topydo.lib.Config import config
 from topydo.lib.HashListValues import hash_list_values
-from topydo.lib.PrettyPrinter import PrettyPrinter
+from topydo.lib.printers.PrettyPrinter import PrettyPrinter
 from topydo.lib.Todo import Todo
 from topydo.lib.View import View
 

topydo/lib/DotPrinter.py → topydo/lib/printers/Dot.py

@@ -22,7 +22,7 @@ notation. Useful for displaying dependencies.
 from textwrap import wrap
 
 from topydo.lib.Colorblock import progress_html_color
-from topydo.lib.PrettyPrinter import Printer
+from topydo.lib.printers.PrettyPrinter import Printer
 from topydo.lib.Utils import humanize_date
 
 

topydo/lib/IcalPrinter.py → topydo/lib/printers/Ical.py

@@ -23,7 +23,7 @@ import random
 import string
 from datetime import datetime, time
 
-from topydo.lib.PrettyPrinter import Printer
+from topydo.lib.printers.PrettyPrinter import Printer
 
 
 def _convert_priority(p_priority):

topydo/lib/JsonPrinter.py → topydo/lib/printers/Json.py

@@ -21,7 +21,7 @@ such that other applications can process it.
 
 import json
 
-from topydo.lib.PrettyPrinter import Printer
+from topydo.lib.printers.PrettyPrinter import Printer
 
 
 def _convert_todo(p_todo):