Sort imports

Sorted using `isort`. Sorted alphabetically, with sections for standard
library, third-party, and then internal imports.

test/TestAddCommand.py

@@ -14,8 +14,16 @@
 # 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 datetime import date
 import unittest
+from datetime import date
+from io import StringIO
+
+from six import u
+
+from test.TestCommand import CommandTest
+from topydo.commands import AddCommand, ListCommand
+from topydo.lib import TodoList
+from topydo.lib.Config import config
 
 # We're searching for 'mock'
 # pylint: disable=no-name-in-module
@@ -24,15 +32,6 @@ try:
 except ImportError:
     import mock
 
-from six import u
-from io import StringIO
-
-from topydo.commands import AddCommand
-from topydo.commands import ListCommand
-from test.TestCommand import CommandTest
-from topydo.lib.Config import config
-from topydo.lib import TodoList
-
 
 class AddCommandTest(CommandTest):
     def setUp(self):

test/TestAppendCommand.py

@@ -16,8 +16,8 @@
 
 import unittest
 
-from topydo.commands.AppendCommand import AppendCommand
 from test.TestCommand import CommandTest
+from topydo.commands.AppendCommand import AppendCommand
 from topydo.lib.TodoList import TodoList
 
 

test/TestArchiveCommand.py

@@ -16,9 +16,9 @@
 
 import unittest
 
-from topydo.commands.ArchiveCommand import ArchiveCommand
-from test.TestCommand import CommandTest
 from test.Facilities import load_file_to_todolist
+from test.TestCommand import CommandTest
+from topydo.commands.ArchiveCommand import ArchiveCommand
 from topydo.lib.TodoList import TodoList
 
 

test/TestColors.py

@@ -17,9 +17,10 @@
 """ Tests for the colorscheme functionality. """
 
 import unittest
-from topydo.lib.Colors import Colors, NEUTRAL_COLOR
-from topydo.lib.Config import config
+
 from test.TestTopydo import TopydoTest
+from topydo.lib.Colors import NEUTRAL_COLOR, Colors
+from topydo.lib.Config import config
 
 
 class ColorsTest(TopydoTest):

test/TestCommand.py

@@ -16,8 +16,8 @@
 
 import unittest
 
-from topydo.lib.Utils import escape_ansi
 from test.TestTopydo import TopydoTest
+from topydo.lib.Utils import escape_ansi
 
 
 class CommandTest(TopydoTest):

test/TestConfig.py

@@ -16,8 +16,8 @@
 
 import unittest
 
-from topydo.lib.Config import config
 from test.TestTopydo import TopydoTest
+from topydo.lib.Config import config
 
 
 class ConfigTest(TopydoTest):

test/TestDeleteCommand.py

@@ -15,11 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+
 from six import u
 
 from test.TestCommand import CommandTest
-from topydo.lib.Config import config
 from topydo.commands.DeleteCommand import DeleteCommand
+from topydo.lib.Config import config
 from topydo.lib.TodoList import TodoList
 from topydo.lib.TodoListBase import InvalidTodoException
 

test/TestDepCommand.py

@@ -16,8 +16,8 @@
 
 import unittest
 
-from topydo.commands.DepCommand import DepCommand
 from test.TestCommand import CommandTest
+from topydo.commands.DepCommand import DepCommand
 from topydo.lib.TodoList import TodoList
 
 

test/TestDepriCommand.py

@@ -15,10 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+
 from six import u
 
-from topydo.commands.DepriCommand import DepriCommand
 from test.TestCommand import CommandTest
+from topydo.commands.DepriCommand import DepriCommand
 from topydo.lib.TodoList import TodoList
 
 

test/TestDoCommand.py

@@ -14,12 +14,13 @@
 # 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 datetime import date, timedelta
 import unittest
+from datetime import date, timedelta
+
 from six import u
 
-from topydo.commands.DoCommand import DoCommand
 from test.TestCommand import CommandTest
+from topydo.commands.DoCommand import DoCommand
 from topydo.lib.TodoList import TodoList
 
 

test/TestEditCommand.py

@@ -14,8 +14,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import unittest
 
+from six import u
+
+from test.TestCommand import CommandTest
+from topydo.commands.EditCommand import EditCommand
+from topydo.lib.Config import config
+from topydo.lib.Todo import Todo
+from topydo.lib.TodoList import TodoList
+
 # We're searching for 'mock'
 # pylint: disable=no-name-in-module
 try:
@@ -23,15 +32,6 @@ try:
 except ImportError:
     import mock
 
-from six import u
-import os
-
-from topydo.commands.EditCommand import EditCommand
-from test.TestCommand import CommandTest
-from topydo.lib.TodoList import TodoList
-from topydo.lib.Todo import Todo
-from topydo.lib.Config import config
-
 
 class EditCommandTest(CommandTest):
     def setUp(self):

test/TestFilter.py

@@ -16,13 +16,14 @@
 
 """ Tests for the filter functionality. """
 
-from datetime import date, timedelta
 import unittest
+from datetime import date, timedelta
 
+from test.Facilities import (load_file, load_file_to_todolist,
+                             todolist_to_string)
+from test.TestTopydo import TopydoTest
 from topydo.lib import Filter
-from test.Facilities import load_file, todolist_to_string, load_file_to_todolist
 from topydo.lib.Todo import Todo
-from test.TestTopydo import TopydoTest
 
 
 class FilterTest(TopydoTest):

test/TestGraph.py

@@ -16,8 +16,8 @@
 
 import unittest
 
-from topydo.lib.Graph import DirectedGraph
 from test.TestTopydo import TopydoTest
+from topydo.lib.Graph import DirectedGraph
 
 
 class GraphTest(TopydoTest):

test/TestImportance.py

@@ -14,13 +14,13 @@
 # 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 datetime import date
 import unittest
+from datetime import date
 
+from test.TestTopydo import TopydoTest
 from topydo.lib.Config import config
 from topydo.lib.Importance import importance
 from topydo.lib.Todo import Todo
-from test.TestTopydo import TopydoTest
 
 
 class ImportanceTest(TopydoTest):

test/TestJsonPrinter.py

@@ -16,9 +16,9 @@
 
 import unittest
 
+from test.TestTopydo import TopydoTest
 from topydo.lib.JsonPrinter import JsonPrinter
 from topydo.lib.Todo import Todo
-from test.TestTopydo import TopydoTest
 
 
 class JsonPrinterTest(TopydoTest):

test/TestListCommand.py

@@ -14,15 +14,16 @@
 # 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 six import u
 import codecs
 import re
 import unittest
 
-from topydo.lib.Config import config
-from topydo.commands.ListCommand import ListCommand
-from test.TestCommand import CommandTest
+from six import u
+
 from test.Facilities import load_file_to_todolist
+from test.TestCommand import CommandTest
+from topydo.commands.ListCommand import ListCommand
+from topydo.lib.Config import config
 
 
 class ListCommandTest(CommandTest):

test/TestListContextCommand.py

@@ -16,9 +16,9 @@
 
 import unittest
 
-from topydo.commands.ListContextCommand import ListContextCommand
-from test.TestCommand import CommandTest
 from test.Facilities import load_file_to_todolist
+from test.TestCommand import CommandTest
+from topydo.commands.ListContextCommand import ListContextCommand
 
 
 class ListContextCommandTest(CommandTest):

test/TestListProjectCommand.py

@@ -16,9 +16,9 @@
 
 import unittest
 
-from topydo.commands.ListProjectCommand import ListProjectCommand
-from test.TestCommand import CommandTest
 from test.Facilities import load_file_to_todolist
+from test.TestCommand import CommandTest
+from topydo.commands.ListProjectCommand import ListProjectCommand
 
 
 class ListProjectCommandTest(CommandTest):

test/TestPostponeCommand.py

@@ -14,12 +14,13 @@
 # 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 datetime import date, timedelta
 import unittest
+from datetime import date, timedelta
+
 from six import u
 
-from topydo.commands.PostponeCommand import PostponeCommand
 from test.TestCommand import CommandTest
+from topydo.commands.PostponeCommand import PostponeCommand
 from topydo.lib.TodoList import TodoList
 
 

test/TestPriorityCommand.py

@@ -15,10 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+
 from six import u
 
-from topydo.commands.PriorityCommand import PriorityCommand
 from test.TestCommand import CommandTest
+from topydo.commands.PriorityCommand import PriorityCommand
 from topydo.lib.TodoList import TodoList
 
 

test/TestRecurrence.py

@@ -14,13 +14,13 @@
 # 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 datetime import date, timedelta
 import unittest
+from datetime import date, timedelta
 
+from test.TestTopydo import TopydoTest
 from topydo.lib.Config import config
-from topydo.lib.Recurrence import advance_recurring_todo, NoRecurrenceException
+from topydo.lib.Recurrence import NoRecurrenceException, advance_recurring_todo
 from topydo.lib.Todo import Todo
-from test.TestTopydo import TopydoTest
 
 
 class RecurrenceTest(TopydoTest):

test/TestRelativeDate.py

@@ -14,11 +14,11 @@
 # 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 datetime import date, timedelta
 import unittest
+from datetime import date, timedelta
 
-from topydo.lib.RelativeDate import relative_date_to_date
 from test.TestTopydo import TopydoTest
+from topydo.lib.RelativeDate import relative_date_to_date
 
 
 class RelativeDateTester(TopydoTest):

test/TestSortCommand.py

@@ -16,10 +16,10 @@
 
 import unittest
 
-from topydo.lib.Config import config
-from topydo.commands.SortCommand import SortCommand
-from test.TestCommand import CommandTest
 from test.Facilities import load_file_to_todolist
+from test.TestCommand import CommandTest
+from topydo.commands.SortCommand import SortCommand
+from topydo.lib.Config import config
 
 
 class SortCommandTest(CommandTest):

test/TestSorter.py

@@ -16,12 +16,12 @@
 
 import unittest
 
+from test.Facilities import (load_file, load_file_to_todolist, print_view,
+                             todolist_to_string)
+from test.TestTopydo import TopydoTest
 from topydo.lib.Config import config
 from topydo.lib.Sorter import Sorter
 
-from test.Facilities import load_file, todolist_to_string, load_file_to_todolist, print_view
-from test.TestTopydo import TopydoTest
-
 
 class SorterTest(TopydoTest):
     def sort_file(self, p_filename, p_filename_ref, p_sorter):

test/TestTagCommand.py

@@ -16,8 +16,8 @@
 
 import unittest
 
-from topydo.commands.TagCommand import TagCommand
 from test.TestCommand import CommandTest
+from topydo.commands.TagCommand import TagCommand
 from topydo.lib.TodoList import TodoList
 
 

test/TestTodo.py

@@ -14,11 +14,11 @@
 # 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 datetime import date, timedelta
 import unittest
+from datetime import date, timedelta
 
-from topydo.lib.Todo import Todo
 from test.TestTopydo import TopydoTest
+from topydo.lib.Todo import Todo
 
 
 def today_date():

test/TestTodoBase.py

@@ -16,12 +16,12 @@
 
 """ Tests for the TodoBase class. """
 
-from datetime import date, timedelta
 import re
 import unittest
+from datetime import date, timedelta
 
-from topydo.lib.TodoBase import TodoBase
 from test.TestTopydo import TopydoTest
+from topydo.lib.TodoBase import TodoBase
 
 
 class TodoBaseTester(TopydoTest):

test/TestTodoFile.py

@@ -14,9 +14,10 @@
 # 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 six import u
 import unittest
 
+from six import u
+
 from test.Facilities import load_file
 from test.TestTopydo import TopydoTest
 

test/TestTodoList.py

@@ -19,13 +19,12 @@
 import re
 import unittest
 
+from test.TestTopydo import TopydoTest
 from topydo.lib.Config import config
 from topydo.lib.Todo import Todo
 from topydo.lib.TodoFile import TodoFile
-from topydo.lib.TodoListBase import InvalidTodoException
 from topydo.lib.TodoList import TodoList
-from topydo.lib.TodoListBase import TodoListBase
-from test.TestTopydo import TopydoTest
+from topydo.lib.TodoListBase import InvalidTodoException, TodoListBase
 
 
 class TodoListTester(TopydoTest):

test/TestView.py

@@ -16,12 +16,12 @@
 
 import unittest
 
+from test.Facilities import load_file, print_view, todolist_to_string
+from test.TestTopydo import TopydoTest
 from topydo.lib import Filter
 from topydo.lib.Sorter import Sorter
-from test.Facilities import load_file, todolist_to_string, print_view
 from topydo.lib.TodoFile import TodoFile
 from topydo.lib.TodoList import TodoList
-from test.TestTopydo import TopydoTest
 
 
 class ViewTest(TopydoTest):

topydo/cli/TopydoCompleter.py

@@ -23,9 +23,8 @@ import datetime
 import re
 
 from prompt_toolkit.completion import Completer, Completion
-
-from topydo.lib.Config import config
 from topydo.Commands import _SUBCOMMAND_MAP
+from topydo.lib.Config import config
 from topydo.lib.RelativeDate import relative_date_to_date
 
 

topydo/cli/UILoader.py

@@ -16,10 +16,12 @@
 
 """ Entry file for the Python todo.txt CLI. """
 
-import sys
 import getopt
-from topydo.cli.CLIApplicationBase import MAIN_OPTS, error
+import sys
+
 from topydo.cli.CLI import CLIApplication
+from topydo.cli.CLIApplicationBase import MAIN_OPTS, error
+
 # enable color on windows CMD
 if "win32" in sys.platform:
     import colorama

topydo/commands/AddCommand.py

@@ -16,14 +16,14 @@
 
 """ Provides the AddCommand class that implements the 'add' subcommand. """
 
-from datetime import date
-import re
-from sys import stdin
 import codecs
+import re
+from datetime import date
 from os.path import expanduser
+from sys import stdin
 
-from topydo.lib.Config import config
 from topydo.lib.Command import Command
+from topydo.lib.Config import config
 from topydo.lib.PrettyPrinterFilter import PrettyPrinterNumbers
 from topydo.lib.RelativeDate import relative_date_to_date
 from topydo.lib.TodoListBase import InvalidTodoException

topydo/commands/DepCommand.py

@@ -14,9 +14,9 @@
 # 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 import Filter
 from topydo.lib.Command import Command, InvalidCommandArgument
 from topydo.lib.Config import config
-from topydo.lib import Filter
 from topydo.lib.PrettyPrinter import pretty_printer_factory
 from topydo.lib.Sorter import Sorter
 from topydo.lib.TodoListBase import InvalidTodoException

topydo/commands/DoCommand.py

@@ -19,7 +19,7 @@ from datetime import date
 from topydo.lib.DCommand import DCommand
 from topydo.lib.PrettyPrinter import PrettyPrinter
 from topydo.lib.PrettyPrinterFilter import PrettyPrinterNumbers
-from topydo.lib.Recurrence import advance_recurring_todo, NoRecurrenceException
+from topydo.lib.Recurrence import NoRecurrenceException, advance_recurring_todo
 from topydo.lib.Utils import date_string_to_date
 
 

topydo/commands/EditCommand.py

@@ -15,17 +15,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from subprocess import call, check_call, CalledProcessError
 import tempfile
+from subprocess import CalledProcessError, call, check_call
 
 from six import u
 
+from topydo.lib.Config import config
 from topydo.lib.ExpressionCommand import ExpressionCommand
 from topydo.lib.MultiCommand import MultiCommand
-from topydo.lib.Config import config
+from topydo.lib.PrettyPrinterFilter import PrettyPrinterNumbers
 from topydo.lib.Todo import Todo
 from topydo.lib.TodoList import TodoList
-from topydo.lib.PrettyPrinterFilter import PrettyPrinterNumbers
 
 # the true and only editor
 DEFAULT_EDITOR = 'vi'

topydo/commands/ListCommand.py

@@ -14,15 +14,13 @@
 # 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.ExpressionCommand import ExpressionCommand
 from topydo.lib.Config import config
-from topydo.lib.PrettyPrinter import pretty_printer_factory
-from topydo.lib.PrettyPrinterFilter import (
-    PrettyPrinterIndentFilter,
-    PrettyPrinterHideTagFilter
-)
+from topydo.lib.ExpressionCommand import ExpressionCommand
 from topydo.lib.IcalPrinter import IcalPrinter
 from topydo.lib.JsonPrinter import JsonPrinter
+from topydo.lib.PrettyPrinter import pretty_printer_factory
+from topydo.lib.PrettyPrinterFilter import (PrettyPrinterHideTagFilter,
+                                            PrettyPrinterIndentFilter)
 
 
 class ListCommand(ExpressionCommand):

topydo/commands/PostponeCommand.py

@@ -16,8 +16,8 @@
 
 from datetime import date, timedelta
 
-from topydo.lib.MultiCommand import MultiCommand
 from topydo.lib.Config import config
+from topydo.lib.MultiCommand import MultiCommand
 from topydo.lib.PrettyPrinterFilter import PrettyPrinterNumbers
 from topydo.lib.RelativeDate import relative_date_to_date
 from topydo.lib.Utils import date_string_to_date

topydo/lib/ExpressionCommand.py

@@ -16,9 +16,9 @@
 
 import re
 
+from topydo.lib import Filter
 from topydo.lib.Command import Command
 from topydo.lib.Config import config
-from topydo.lib import Filter
 from topydo.lib.Sorter import Sorter
 from topydo.lib.View import View
 

topydo/lib/IcalPrinter.py

@@ -19,9 +19,9 @@ Provides a printer that transforms a list of Todo items to an iCalendar
 file according to RFC 2445.
 """
 
-from datetime import datetime, time
 import random
 import string
+from datetime import datetime, time
 
 from topydo.lib.PrettyPrinter import Printer
 

topydo/lib/PrettyPrinter.py

@@ -14,10 +14,8 @@
 # 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.PrettyPrinterFilter import (
-    PrettyPrinterColorFilter,
-    PrettyPrinterNumbers
-)
+from topydo.lib.PrettyPrinterFilter import (PrettyPrinterColorFilter,
+                                            PrettyPrinterNumbers)
 
 
 class Printer(object):

topydo/lib/PrettyPrinterFilter.py

@@ -17,10 +17,11 @@
 """ Provides filters used for pretty printing. """
 
 import re
+
 from six import u
 
+from topydo.lib.Colors import NEUTRAL_COLOR, Colors
 from topydo.lib.Config import config
-from topydo.lib.Colors import Colors, NEUTRAL_COLOR
 
 
 class PrettyPrinterFilter(object):

topydo/lib/RelativeDate.py

@@ -16,9 +16,9 @@
 
 """ This module deals with relative dates (2d, 5y, Monday, today, etc.) """
 
-from datetime import date, timedelta
 import calendar
 import re
+from datetime import date, timedelta
 
 
 def _add_months(p_sourcedate, p_months):

topydo/lib/Sorter.py

@@ -16,10 +16,10 @@
 
 """ This module provides functionality to sort lists with todo items. """
 
-from datetime import date
 import re
+from datetime import date
 
-from topydo.lib.Importance import importance, average_importance
+from topydo.lib.Importance import average_importance, importance
 
 
 def is_priority_field(p_field):

topydo/lib/TodoBase.py

@@ -18,8 +18,9 @@
 This module contains the class that represents a single todo item.
 """
 
-from datetime import date
 import re
+from datetime import date
+
 from six import u
 
 from topydo.lib.TodoParser import parse_line

topydo/lib/TodoListBase.py

@@ -18,12 +18,13 @@
 A list of todo items.
 """
 
-from datetime import date
 import re
+from datetime import date
+
 from six import text_type
 
-from topydo.lib.Config import config
 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.Todo import Todo

topydo/lib/Utils.py

@@ -18,8 +18,8 @@
 Various utility functions.
 """
 
-from datetime import date
 import re
+from datetime import date
 
 
 def date_string_to_date(p_date):