fix import code style with isort

24 files changed, 33 insertions, 53 deletions

diff --git a/Makefile b/Makefile
index 866c16a..34a60cc 100644
--- a/Makefile
+++ b/Makefile
@@ -30,13 +30,13 @@ install: check-poetry ## install python-creole via poetry
 
 lint: ## Run code formatters and linter
 	poetry run flynt --fail-on-change --line_length=119 creole
-# 	poetry run isort --check-only --recursive creole
+	poetry run isort --check-only --recursive creole
 # 	poetry run black --line-length=119 --check creole
 # 	poetry run flake8 creole
 
 fix-code-style: ## Fix code formatting
 	poetry run flynt --line_length=119 creole
-# 	poetry run isort --apply --recursive creole
+	poetry run isort --apply --recursive creole
 # 	poetry run autopep8 --ignore-local-config --max-line-length=${MAX_LINE_LENGTH} --aggressive --aggressive --in-place --recursive creole
 
 tox-listenvs: check-poetry ## List all tox test environments
diff --git a/creole/__init__.py b/creole/__init__.py
index e9dc0da..6c486d8 100644
--- a/creole/__init__.py
+++ b/creole/__init__.py
@@ -23,13 +23,12 @@
 import warnings
 
 from creole.emitter.creol2html_emitter import HtmlEmitter
-from creole.parser.creol2html_parser import CreoleParser
 from creole.emitter.html2creole_emitter import CreoleEmitter
 from creole.emitter.html2rest_emitter import ReStructuredTextEmitter
 from creole.emitter.html2textile_emitter import TextileEmitter
+from creole.parser.creol2html_parser import CreoleParser
 from creole.parser.html_parser import HtmlParser
 
-
 __version__ = "1.4.0"
 __api__ = "1.0" # Creole 1.0 spec - http://wikicreole.org/
 
diff --git a/creole/cmdline.py b/creole/cmdline.py
index 66e49be..bfbd65c 100644
--- a/creole/cmdline.py
+++ b/creole/cmdline.py
@@ -12,8 +12,7 @@
 import argparse
 import codecs
 
-from creole import creole2html, html2creole, html2rest, html2textile
-from creole import VERSION_STRING
+from creole import VERSION_STRING, creole2html, html2creole, html2rest, html2textile
 
 
 class CreoleCLI(object):
diff --git a/creole/emitter/creol2html_emitter.py b/creole/emitter/creol2html_emitter.py
index e583567..7fb398a 100644
--- a/creole/emitter/creol2html_emitter.py
+++ b/creole/emitter/creol2html_emitter.py
@@ -8,9 +8,9 @@
 
 
 import json
-from xml.sax.saxutils import escape
 import sys
 import traceback
+from xml.sax.saxutils import escape
 
 from creole.parser.creol2html_parser import CreoleParser
 from creole.shared.utils import string2dict
diff --git a/creole/emitter/html2creole_emitter.py b/creole/emitter/html2creole_emitter.py
index 4a191b3..8ff0360 100644
--- a/creole/emitter/html2creole_emitter.py
+++ b/creole/emitter/html2creole_emitter.py
@@ -16,7 +16,6 @@ import posixpath
 from creole.shared.base_emitter import BaseEmitter
 
 
-
 class CreoleEmitter(BaseEmitter):
     """
     Build from a document_tree (html2creole.parser.HtmlParser instance) a
diff --git a/creole/emitter/html2rest_emitter.py b/creole/emitter/html2rest_emitter.py
index 9c46313..84af8e4 100644
--- a/creole/emitter/html2rest_emitter.py
+++ b/creole/emitter/html2rest_emitter.py
@@ -19,7 +19,6 @@ import posixpath
 from creole.shared.base_emitter import BaseEmitter
 from creole.shared.markup_table import MarkupTable
 
-
 # Kink of nodes in which hyperlinks are stored in references intead of embedded urls.
 DO_SUBSTITUTION = ("th", "td",) # TODO: In witch kind of node must we also substitude links?
 
@@ -341,4 +340,3 @@ if __name__ == '__main__':
     print(content)
     print("*" * 79)
     print(content.replace(" ", ".").replace("\n", "\\n\n"))
-
diff --git a/creole/emitter/html2textile_emitter.py b/creole/emitter/html2textile_emitter.py
index 0326ec9..a557fe3 100644
--- a/creole/emitter/html2textile_emitter.py
+++ b/creole/emitter/html2textile_emitter.py
@@ -16,7 +16,6 @@ import posixpath
 from creole.shared.base_emitter import BaseEmitter
 
 
-
 class TextileEmitter(BaseEmitter):
     """
     Build from a document_tree (html2creole.parser.HtmlParser instance) a
diff --git a/creole/html_tools/deentity.py b/creole/html_tools/deentity.py
index 1f706ae..b22a17c 100644
--- a/creole/html_tools/deentity.py
+++ b/creole/html_tools/deentity.py
@@ -12,7 +12,6 @@
 import re
 from html import entities
 
-
 entities_rules = '|'.join([
     r"(&\#(?P<number>\d+);)",
     r"(&\#x(?P<hex>[a-fA-F0-9]+);)",
diff --git a/creole/html_tools/strip_html.py b/creole/html_tools/strip_html.py
index c5e79a2..b6729b3 100644
--- a/creole/html_tools/strip_html.py
+++ b/creole/html_tools/strip_html.py
@@ -17,7 +17,6 @@ import re
 
 from creole.parser.html_parser_config import BLOCK_TAGS
 
-
 strip_html_regex = re.compile(
     r"""
         \s*
diff --git a/creole/html_tools/text_tools.py b/creole/html_tools/text_tools.py
index 5843cf6..d42985a 100644
--- a/creole/html_tools/text_tools.py
+++ b/creole/html_tools/text_tools.py
@@ -15,7 +15,6 @@
 
 import re
 
-
 space_re = re.compile(r"^(\s*)(.*?)(\s*)$", re.DOTALL)
 def clean_whitespace(txt):
     """
diff --git a/creole/parser/creol2html_parser.py b/creole/parser/creol2html_parser.py
index 9e97031..cd0c0e4 100644
--- a/creole/parser/creol2html_parser.py
+++ b/creole/parser/creol2html_parser.py
@@ -22,8 +22,7 @@
 import re
 from pprint import pformat
 
-from creole.parser.creol2html_rules import BlockRules, INLINE_FLAGS, INLINE_RULES, \
-    SpecialRules, InlineRules
+from creole.parser.creol2html_rules import INLINE_FLAGS, INLINE_RULES, BlockRules, InlineRules, SpecialRules
 from creole.shared.document_tree import DocNode
 
 
diff --git a/creole/setup_utils.py b/creole/setup_utils.py
index 2eb28ab..a4cf583 100644
--- a/creole/setup_utils.py
+++ b/creole/setup_utils.py
@@ -50,7 +50,6 @@ import warnings
 from creole import creole2html, html2rest
 from creole.shared.unknown_tags import raise_unknown_node, transparent_unknown_nodes
 
-
 RAISE_ERRORS_ARGS = (
     "check", "register", "sdist", "bdist", "upload",
     "--long-description", "--restructuredtext",
@@ -139,4 +138,3 @@ if __name__ == "__main__":
     package_root = os.path.abspath("../")
     long_description = get_long_description(package_root)
     print(long_description)
-
diff --git a/creole/shared/base_emitter.py b/creole/shared/base_emitter.py
index 8113de1..a9964e5 100644
--- a/creole/shared/base_emitter.py
+++ b/creole/shared/base_emitter.py
@@ -9,8 +9,8 @@
 """
 
 
-from creole.parser.html_parser_config import BLOCK_TAGS
 from creole.html_tools.deentity import Deentity
+from creole.parser.html_parser_config import BLOCK_TAGS
 from creole.shared.markup_table import MarkupTable
 from creole.shared.unknown_tags import transparent_unknown_nodes
 
diff --git a/creole/shared/document_tree.py b/creole/shared/document_tree.py
index 6198c8a..31af1d8 100644
--- a/creole/shared/document_tree.py
+++ b/creole/shared/document_tree.py
@@ -10,8 +10,8 @@
     :license: GNU GPL v3 or above, see LICENSE for more details.
 """
 
-import warnings
 import inspect
+import warnings
 
 from creole.shared.utils import dict2string
 
diff --git a/creole/shared/example_macros.py b/creole/shared/example_macros.py
index 428d5d2..25deac7 100644
--- a/creole/shared/example_macros.py
+++ b/creole/shared/example_macros.py
@@ -15,13 +15,14 @@
 
 from xml.sax.saxutils import escape
 
+from creole.shared.utils import get_pygments_formatter, get_pygments_lexer
+
 try:
     from pygments import highlight
     PYGMENTS = True
 except ImportError:
     PYGMENTS = False
 
-from creole.shared.utils import get_pygments_lexer, get_pygments_formatter
 
 
 def html(text):
diff --git a/creole/shared/utils.py b/creole/shared/utils.py
index f80a8ef..a1b5167 100644
--- a/creole/shared/utils.py
+++ b/creole/shared/utils.py
@@ -11,10 +11,8 @@
 
 
 
-import shlex
 import json
-
-
+import shlex
 
 try:
     from pygments import lexers
diff --git a/creole/tests/test_TODOs.py b/creole/tests/test_TODOs.py
index b396c86..e0606ee 100644
--- a/creole/tests/test_TODOs.py
+++ b/creole/tests/test_TODOs.py
@@ -6,8 +6,8 @@
 
 import unittest
 
-from creole.tests.utils.base_unittest import BaseCreoleTest
 from creole.html_tools.strip_html import strip_html
+from creole.tests.utils.base_unittest import BaseCreoleTest
 
 
 class StripHtml(unittest.TestCase):
@@ -146,5 +146,3 @@ class TestHtml2CreoleMarkup(BaseCreoleTest):
             <p>picture <a href="www.domain.tld"><img src="foo.JPG" alt="Foo"></a> as a link</p>
         """#, debug=True
         )
-
-
diff --git a/creole/tests/test_cli.py b/creole/tests/test_cli.py
index be5f944..74c3083 100644
--- a/creole/tests/test_cli.py
+++ b/creole/tests/test_cli.py
@@ -11,15 +11,14 @@
 
 
 
+import os
 import subprocess
-import unittest
 import sys
-import os
 import tempfile
+import unittest
 
-from creole import cmdline
+from creole import VERSION_STRING, cmdline
 from creole.tests.utils.base_unittest import BaseCreoleTest
-from creole import VERSION_STRING
 from creole.tests.utils.unittest_subprocess import SubprocessMixin
 
 CMDS = ("creole2html", "html2creole", "html2rest", "html2textile")
diff --git a/creole/tests/test_creole2html.py b/creole/tests/test_creole2html.py
index dfa1246..de02abd 100644
--- a/creole/tests/test_creole2html.py
+++ b/creole/tests/test_creole2html.py
@@ -18,22 +18,21 @@
 
 import sys
 import unittest
-
-
 from io import StringIO
 
+from creole import creole2html
+from creole.shared import example_macros
+from creole.shared.utils import dict2string, string2dict
+from creole.tests import test_macros
+from creole.tests.utils.base_unittest import BaseCreoleTest
+
 try:
     from pygments import highlight
     PYGMENTS = True
 except ImportError:
     PYGMENTS = False
 
-from creole.tests.utils.base_unittest import BaseCreoleTest
-from creole.tests import test_macros
 
-from creole import creole2html
-from creole.shared import example_macros
-from creole.shared.utils import string2dict, dict2string
 
 
 class TestCreole2html(BaseCreoleTest):
diff --git a/creole/tests/test_cross_compare_all.py b/creole/tests/test_cross_compare_all.py
index b10f59a..ad715bc 100644
--- a/creole/tests/test_cross_compare_all.py
+++ b/creole/tests/test_cross_compare_all.py
@@ -22,8 +22,6 @@
 
 import unittest
 
-
-
 from creole.tests.utils.base_unittest import BaseCreoleTest
 
 
diff --git a/creole/tests/test_html2creole.py b/creole/tests/test_html2creole.py
index df7c951..41c6e8e 100644
--- a/creole/tests/test_html2creole.py
+++ b/creole/tests/test_html2creole.py
@@ -17,11 +17,10 @@
 
 import unittest
 
-from creole.tests.utils.base_unittest import BaseCreoleTest
-
 from creole import html2creole
-from creole.shared.unknown_tags import raise_unknown_node, use_html_macro, \
-                            escape_unknown_nodes, transparent_unknown_nodes
+from creole.shared.unknown_tags import (escape_unknown_nodes, raise_unknown_node, transparent_unknown_nodes,
+                                        use_html_macro)
+from creole.tests.utils.base_unittest import BaseCreoleTest
 
 
 class TestHtml2Creole(unittest.TestCase):
@@ -547,4 +546,3 @@ if __name__ == '__main__':
     unittest.main(
 #        defaultTest="TestHtml2CreoleMarkup.test_nested_listsitems_with_paragraph"
     )
-
diff --git a/creole/tests/test_macros.py b/creole/tests/test_macros.py
index 5069a27..e2548e2 100644
--- a/creole/tests/test_macros.py
+++ b/creole/tests/test_macros.py
@@ -16,6 +16,7 @@
 
 import json
 
+
 def unittest_macro1(**kwargs):
     """
     >>> unittest_macro1(foo="bar")
diff --git a/creole/tests/test_setup_utils.py b/creole/tests/test_setup_utils.py
index b912f92..0d6eb3b 100644
--- a/creole/tests/test_setup_utils.py
+++ b/creole/tests/test_setup_utils.py
@@ -10,20 +10,21 @@
 """
 
 
-import unittest
 import os
+import tempfile
+import unittest
 import warnings
 
+import creole
+from creole.setup_utils import get_long_description
+from creole.tests.utils.base_unittest import BaseCreoleTest
+
 try:
     import docutils
     DOCUTILS = True
 except ImportError:
     DOCUTILS = False
 
-import creole
-from creole.setup_utils import get_long_description
-from creole.tests.utils.base_unittest import BaseCreoleTest
-import tempfile
 
 
 CREOLE_PACKAGE_ROOT = os.path.abspath(os.path.join(os.path.dirname(creole.__file__), ".."))
diff --git a/creole/tests/utils/base_unittest.py b/creole/tests/utils/base_unittest.py
index 4feb3b9..5f6bba4 100644
--- a/creole/tests/utils/base_unittest.py
+++ b/creole/tests/utils/base_unittest.py
@@ -14,9 +14,10 @@
 import re
 import warnings
 
+from creole import creole2html, html2creole, html2rest, html2textile
+from creole.exceptions import DocutilsImportError
 from creole.tests.utils.utils import MarkupTest
 
-
 try:
     import textile
 except ImportError:
@@ -29,8 +30,6 @@ else:
     test_textile = True
 
 
-from creole.exceptions import DocutilsImportError
-from creole import creole2html, html2creole, html2textile, html2rest
 
 try:
     from creole.rest_tools.clean_writer import rest2html