diff options
Diffstat (limited to 'creole/tests')
-rw-r--r-- | creole/tests/test_TODOs.py | 4 | ||||
-rw-r--r-- | creole/tests/test_cli.py | 7 | ||||
-rw-r--r-- | creole/tests/test_creole2html.py | 13 | ||||
-rw-r--r-- | creole/tests/test_cross_compare_all.py | 2 | ||||
-rw-r--r-- | creole/tests/test_html2creole.py | 8 | ||||
-rw-r--r-- | creole/tests/test_macros.py | 1 | ||||
-rw-r--r-- | creole/tests/test_setup_utils.py | 11 | ||||
-rw-r--r-- | creole/tests/utils/base_unittest.py | 5 |
8 files changed, 22 insertions, 29 deletions
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 |