diff options
| author | aa-turner <aa-turner@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-10-21 00:58:07 +0000 |
|---|---|---|
| committer | aa-turner <aa-turner@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-10-21 00:58:07 +0000 |
| commit | a897721eb0eeb4db72d63b112ecb9393a4b6dc5d (patch) | |
| tree | 8a16f2cdb14dc56ef1661c92ff79dce7d7f8232b /docutils | |
| parent | 105abda1e913d86105c6b8226eef7c304809add1 (diff) | |
| download | docutils-a897721eb0eeb4db72d63b112ecb9393a4b6dc5d.tar.gz | |
Import ``DocutilsTestSupport`` from ``test``
This is the first step of moving to the standard ``unittest`` style.
It involves making the ``test/`` directory a psuedo-package and
importing the ``DocutilsTestSupport`` module from it, instead of the
path manipulation previously carried out in ``__init__.py`` files.
As of this, we also blank out all ``__init__.py`` files in the test
directories.
git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@9140 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils')
125 files changed, 117 insertions, 229 deletions
diff --git a/docutils/test/__init__.py b/docutils/test/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/docutils/test/__init__.py diff --git a/docutils/test/test_parsers/__init__.py b/docutils/test/test_parsers/__init__.py index e88b33c92..e69de29bb 100644 --- a/docutils/test/test_parsers/__init__.py +++ b/docutils/test/test_parsers/__init__.py @@ -1,14 +0,0 @@ -import os -import os.path -import sys - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) -prev = '' -while sys.path[0] != prev: - try: - import DocutilsTestSupport # noqa: F401 - break - except ImportError: - prev = sys.path[0] - sys.path[0] = os.path.dirname(prev) -sys.path.pop(0) diff --git a/docutils/test/test_parsers/test_get_parser_class.py b/docutils/test/test_parsers/test_get_parser_class.py index 87c009562..ad0873763 100644 --- a/docutils/test/test_parsers/test_get_parser_class.py +++ b/docutils/test/test_parsers/test_get_parser_class.py @@ -11,7 +11,7 @@ test get_parser_class if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.parsers import get_parser_class diff --git a/docutils/test/test_parsers/test_recommonmark/__init__.py b/docutils/test/test_parsers/test_recommonmark/__init__.py index e88b33c92..e69de29bb 100644 --- a/docutils/test/test_parsers/test_recommonmark/__init__.py +++ b/docutils/test/test_parsers/test_recommonmark/__init__.py @@ -1,14 +0,0 @@ -import os -import os.path -import sys - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) -prev = '' -while sys.path[0] != prev: - try: - import DocutilsTestSupport # noqa: F401 - break - except ImportError: - prev = sys.path[0] - sys.path[0] = os.path.dirname(prev) -sys.path.pop(0) diff --git a/docutils/test/test_parsers/test_recommonmark/test_block_quotes.py b/docutils/test/test_parsers/test_recommonmark/test_block_quotes.py index 834932574..4060e4476 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_block_quotes.py +++ b/docutils/test/test_parsers/test_recommonmark/test_block_quotes.py @@ -16,7 +16,7 @@ Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_bullet_lists.py b/docutils/test/test_parsers/test_recommonmark/test_bullet_lists.py index b4b63858f..f737be618 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_bullet_lists.py +++ b/docutils/test/test_parsers/test_recommonmark/test_bullet_lists.py @@ -16,7 +16,7 @@ Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_enumerated_lists.py b/docutils/test/test_parsers/test_recommonmark/test_enumerated_lists.py index 7905cdb0d..314d7d552 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_enumerated_lists.py +++ b/docutils/test/test_parsers/test_recommonmark/test_enumerated_lists.py @@ -15,7 +15,7 @@ Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_html_blocks.py b/docutils/test/test_parsers/test_recommonmark/test_html_blocks.py index dd90693b3..f40678b8a 100644 --- a/docutils/test/test_parsers/test_recommonmark/test_html_blocks.py +++ b/docutils/test/test_parsers/test_recommonmark/test_html_blocks.py @@ -16,7 +16,7 @@ Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_inline_markup.py b/docutils/test/test_parsers/test_recommonmark/test_inline_markup.py index 73c64027d..4d9da7ede 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_inline_markup.py +++ b/docutils/test/test_parsers/test_recommonmark/test_inline_markup.py @@ -15,7 +15,7 @@ Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_line_length_limit.py b/docutils/test/test_parsers/test_recommonmark/test_line_length_limit.py index 422f7f16b..45f2df1cc 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_line_length_limit.py +++ b/docutils/test/test_parsers/test_recommonmark/test_line_length_limit.py @@ -16,7 +16,7 @@ Interpreted text tests are in a separate module, test_interpreted.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_line_length_limit_default.py b/docutils/test/test_parsers/test_recommonmark/test_line_length_limit_default.py index 256580a1c..1a5a523ea 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_line_length_limit_default.py +++ b/docutils/test/test_parsers/test_recommonmark/test_line_length_limit_default.py @@ -17,7 +17,7 @@ Interpreted text tests are in a separate module, test_interpreted.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_literal_blocks.py b/docutils/test/test_parsers/test_recommonmark/test_literal_blocks.py index 0d9c8ef24..fb43b2bf1 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_literal_blocks.py +++ b/docutils/test/test_parsers/test_recommonmark/test_literal_blocks.py @@ -16,7 +16,7 @@ Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_paragraphs.py b/docutils/test/test_parsers/test_recommonmark/test_paragraphs.py index 344956541..58162d788 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_paragraphs.py +++ b/docutils/test/test_parsers/test_recommonmark/test_paragraphs.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_section_headers.py b/docutils/test/test_parsers/test_recommonmark/test_section_headers.py index e4e3a754c..3d5bda33f 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_section_headers.py +++ b/docutils/test/test_parsers/test_recommonmark/test_section_headers.py @@ -15,7 +15,7 @@ Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_targets.py b/docutils/test/test_parsers/test_recommonmark/test_targets.py index 34fa1f085..731b7141d 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_targets.py +++ b/docutils/test/test_parsers/test_recommonmark/test_targets.py @@ -15,7 +15,7 @@ Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_recommonmark/test_transitions.py b/docutils/test/test_parsers/test_recommonmark/test_transitions.py index 2bcf0f51b..7710fef4f 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_transitions.py +++ b/docutils/test/test_parsers/test_recommonmark/test_transitions.py @@ -10,7 +10,7 @@ Tests for transitions (`thematic breaks`). if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/__init__.py b/docutils/test/test_parsers/test_rst/__init__.py index e88b33c92..e69de29bb 100644 --- a/docutils/test/test_parsers/test_rst/__init__.py +++ b/docutils/test/test_parsers/test_rst/__init__.py @@ -1,14 +0,0 @@ -import os -import os.path -import sys - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) -prev = '' -while sys.path[0] != prev: - try: - import DocutilsTestSupport # noqa: F401 - break - except ImportError: - prev = sys.path[0] - sys.path[0] = os.path.dirname(prev) -sys.path.pop(0) diff --git a/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py b/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py index abdf81c8a..c92cf93ab 100755 --- a/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py +++ b/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py @@ -9,7 +9,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_TableParser.py b/docutils/test/test_parsers/test_rst/test_TableParser.py index 13a13e9d5..6b2b55559 100755 --- a/docutils/test/test_parsers/test_rst/test_TableParser.py +++ b/docutils/test/test_parsers/test_rst/test_TableParser.py @@ -9,7 +9,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_block_quotes.py b/docutils/test/test_parsers/test_rst/test_block_quotes.py index 08952d7dd..d738062ef 100755 --- a/docutils/test/test_parsers/test_rst/test_block_quotes.py +++ b/docutils/test/test_parsers/test_rst/test_block_quotes.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_bullet_lists.py b/docutils/test/test_parsers/test_rst/test_bullet_lists.py index 39a2b2071..393bcd88c 100755 --- a/docutils/test/test_parsers/test_rst/test_bullet_lists.py +++ b/docutils/test/test_parsers/test_rst/test_bullet_lists.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_character_level_inline_markup.py b/docutils/test/test_parsers/test_rst/test_character_level_inline_markup.py index 9ffdcf472..c45dfa968 100644 --- a/docutils/test/test_parsers/test_rst/test_character_level_inline_markup.py +++ b/docutils/test/test_parsers/test_rst/test_character_level_inline_markup.py @@ -12,7 +12,7 @@ Experimental. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_citations.py b/docutils/test/test_parsers/test_rst/test_citations.py index 1a3e7c609..ca05253d7 100755 --- a/docutils/test/test_parsers/test_rst/test_citations.py +++ b/docutils/test/test_parsers/test_rst/test_citations.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_comments.py b/docutils/test/test_parsers/test_rst/test_comments.py index 3799b86ef..03fccc963 100755 --- a/docutils/test/test_parsers/test_rst/test_comments.py +++ b/docutils/test/test_parsers/test_rst/test_comments.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_definition_lists.py b/docutils/test/test_parsers/test_rst/test_definition_lists.py index 1b73eb0f3..5a12aa13f 100755 --- a/docutils/test/test_parsers/test_rst/test_definition_lists.py +++ b/docutils/test/test_parsers/test_rst/test_definition_lists.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/__init__.py b/docutils/test/test_parsers/test_rst/test_directives/__init__.py index e88b33c92..e69de29bb 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/__init__.py +++ b/docutils/test/test_parsers/test_rst/test_directives/__init__.py @@ -1,14 +0,0 @@ -import os -import os.path -import sys - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) -prev = '' -while sys.path[0] != prev: - try: - import DocutilsTestSupport # noqa: F401 - break - except ImportError: - prev = sys.path[0] - sys.path[0] = os.path.dirname(prev) -sys.path.pop(0) diff --git a/docutils/test/test_parsers/test_rst/test_directives/test__init__.py b/docutils/test/test_parsers/test_rst/test_directives/test__init__.py index 96046512b..806094b9b 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test__init__.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test__init__.py @@ -18,7 +18,7 @@ import unittest if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport import docutils import docutils.parsers.null diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py index 0183727bc..15f1d303b 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py @@ -10,7 +10,7 @@ Tests for admonitions.py directives. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_de.py b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_de.py index 0b1f933a4..7e8a13c42 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_de.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_de.py @@ -10,7 +10,7 @@ Tests for admonitions.py directives in German document. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_dummy_lang.py b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_dummy_lang.py index fc2731634..c9006753e 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_dummy_lang.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_dummy_lang.py @@ -10,7 +10,7 @@ Tests for admonition directives with local language module. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_block_quotes.py b/docutils/test/test_parsers/test_rst/test_directives/test_block_quotes.py index 766cf7120..e8dd3db2a 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_block_quotes.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_block_quotes.py @@ -11,7 +11,7 @@ Tests for the block quote directives "epigraph", "highlights", and if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_class.py b/docutils/test/test_parsers/test_rst/test_directives/test_class.py index 3dc6cfff1..7a1a4695a 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_class.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_class.py @@ -10,7 +10,7 @@ Tests for the 'class' directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_code.py b/docutils/test/test_parsers/test_rst/test_directives/test_code.py index 1d9e7670b..84405cca4 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_code.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_code.py @@ -10,7 +10,7 @@ Test the 'code' directive in parsers/rst/directives/body.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.utils.code_analyzer import with_pygments diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py b/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py index 72fdc96f5..f2b5a547e 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py @@ -10,7 +10,7 @@ Test the 'code' directive in body.py with syntax_highlight = 'long'. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.utils.code_analyzer import with_pygments diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py b/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py index 08493458c..5197c4b32 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py @@ -10,7 +10,7 @@ Test the 'code' directive in body.py with syntax_highlight = 'none'. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_compound.py b/docutils/test/test_parsers/test_rst/test_directives/test_compound.py index 0b14af37e..3973ab062 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_compound.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_compound.py @@ -10,7 +10,7 @@ Tests for the 'compound' directive from body.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_container.py b/docutils/test/test_parsers/test_rst/test_directives/test_container.py index 06db7961d..ec35b3d5e 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_container.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_container.py @@ -10,7 +10,7 @@ Tests for the 'container' directive from body.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_contents.py b/docutils/test/test_parsers/test_rst/test_directives/test_contents.py index 6f33872ef..8da416b18 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_contents.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_contents.py @@ -10,7 +10,7 @@ Tests for parts.py contents directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_date.py b/docutils/test/test_parsers/test_rst/test_directives/test_date.py index c4c70227c..6baffb690 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_date.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_date.py @@ -10,7 +10,7 @@ Tests for the misc.py "date" directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport import time from docutils.io import _locale_encoding # noqa diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_decorations.py b/docutils/test/test_parsers/test_rst/test_directives/test_decorations.py index 5638e1f43..db90d8b85 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_decorations.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_decorations.py @@ -10,7 +10,7 @@ Tests for the "header" & "footer" directives. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_default_role.py b/docutils/test/test_parsers/test_rst/test_directives/test_default_role.py index b9941ae21..e915e6705 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_default_role.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_default_role.py @@ -10,7 +10,7 @@ Tests for misc.py "default-role" directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_figures.py b/docutils/test/test_parsers/test_rst/test_directives/test_figures.py index 6dd4fa994..459e90b02 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_figures.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_figures.py @@ -10,7 +10,7 @@ Tests for images.py figure directives. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_images.py b/docutils/test/test_parsers/test_rst/test_directives/test_images.py index 856d8c918..fdc797f58 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_images.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_images.py @@ -10,7 +10,7 @@ Tests for images.py image directives. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_include.py b/docutils/test/test_parsers/test_rst/test_directives/test_include.py index fac34f9d1..b13c64d4e 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_include.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_include.py @@ -10,7 +10,7 @@ Tests for misc.py "include" directive. import os.path if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils import parsers from docutils.utils.code_analyzer import with_pygments diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_line_blocks.py b/docutils/test/test_parsers/test_rst/test_directives/test_line_blocks.py index 1213184fa..39d67f1b5 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_line_blocks.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_line_blocks.py @@ -10,7 +10,7 @@ Tests for the body.py 'line-block' directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_math.py b/docutils/test/test_parsers/test_rst/test_directives/test_math.py index 4fa641507..03b25f78f 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_math.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_math.py @@ -10,7 +10,7 @@ Tests for the 'math' directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_meta.py b/docutils/test/test_parsers/test_rst/test_directives/test_meta.py index 8964d6526..98fa0fc59 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_meta.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_meta.py @@ -10,7 +10,7 @@ Tests for html meta directives. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_parsed_literals.py b/docutils/test/test_parsers/test_rst/test_directives/test_parsed_literals.py index b190320ff..c20002caf 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_parsed_literals.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_parsed_literals.py @@ -10,7 +10,7 @@ Tests for the body.py 'parsed-literal' directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_raw.py b/docutils/test/test_parsers/test_rst/test_directives/test_raw.py index 4acb477a2..f60cb5a45 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_raw.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_raw.py @@ -12,7 +12,7 @@ import os.path if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_replace.py b/docutils/test/test_parsers/test_rst/test_directives/test_replace.py index be91a8a44..27a92dc7a 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_replace.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_replace.py @@ -10,7 +10,7 @@ Tests for misc.py "replace" directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py b/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py index 463574ccb..810a45314 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py @@ -11,7 +11,7 @@ Test in french (not default/fallback language). if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_role.py b/docutils/test/test_parsers/test_rst/test_directives/test_role.py index 5127bfeb7..83447c92a 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_role.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_role.py @@ -10,7 +10,7 @@ Tests for misc.py "role" directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_rubrics.py b/docutils/test/test_parsers/test_rst/test_directives/test_rubrics.py index 121d217c3..fc9225887 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_rubrics.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_rubrics.py @@ -10,7 +10,7 @@ Tests for the "rubric" directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_sectnum.py b/docutils/test/test_parsers/test_rst/test_directives/test_sectnum.py index d0eda4bd2..7016da225 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_sectnum.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_sectnum.py @@ -10,7 +10,7 @@ Tests for the 'sectnum' directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py b/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py index da6ee7a3a..5670eb5f6 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py @@ -10,7 +10,7 @@ Tests for the "sidebar" directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_tables.py b/docutils/test/test_parsers/test_rst/test_directives/test_tables.py index 3f7388b4c..9259a092d 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_tables.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_tables.py @@ -14,7 +14,7 @@ import platform if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_target_notes.py b/docutils/test/test_parsers/test_rst/test_directives/test_target_notes.py index a62b1546e..5c5cd3bb5 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_target_notes.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_target_notes.py @@ -10,7 +10,7 @@ Tests for the target-notes directives. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_test_directives.py b/docutils/test/test_parsers/test_rst/test_directives/test_test_directives.py index e46170f03..bd5d9aa22 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_test_directives.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_test_directives.py @@ -10,7 +10,7 @@ Tests for misc.py test directives. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_title.py b/docutils/test/test_parsers/test_rst/test_directives/test_title.py index 5e754c39a..14507daa6 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_title.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_title.py @@ -10,7 +10,7 @@ Tests for the 'title' directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_topics.py b/docutils/test/test_parsers/test_rst/test_directives/test_topics.py index d6fda586e..b8969d8a9 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_topics.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_topics.py @@ -10,7 +10,7 @@ Tests for the "topic" directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py b/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py index 03aa5af54..3ba742ff4 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py @@ -11,7 +11,7 @@ Tests for misc.py "unicode" directive. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_unknown.py b/docutils/test/test_parsers/test_rst/test_directives/test_unknown.py index 63bc98c79..3b2912590 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_unknown.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_unknown.py @@ -10,7 +10,7 @@ Tests for unknown directives. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_doctest_blocks.py b/docutils/test/test_parsers/test_rst/test_doctest_blocks.py index 63145ba35..70445f76f 100755 --- a/docutils/test/test_parsers/test_rst/test_doctest_blocks.py +++ b/docutils/test/test_parsers/test_rst/test_doctest_blocks.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_east_asian_text.py b/docutils/test/test_parsers/test_rst/test_east_asian_text.py index 50222d54b..a5c8500d4 100755 --- a/docutils/test/test_parsers/test_rst/test_east_asian_text.py +++ b/docutils/test/test_parsers/test_rst/test_east_asian_text.py @@ -9,7 +9,7 @@ Tests for East Asian text with double-width characters. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_enumerated_lists.py b/docutils/test/test_parsers/test_rst/test_enumerated_lists.py index 3b0f5d50f..5f3ecfd5b 100755 --- a/docutils/test/test_parsers/test_rst/test_enumerated_lists.py +++ b/docutils/test/test_parsers/test_rst/test_enumerated_lists.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_field_lists.py b/docutils/test/test_parsers/test_rst/test_field_lists.py index 8804f91b0..17cf1f90c 100755 --- a/docutils/test/test_parsers/test_rst/test_field_lists.py +++ b/docutils/test/test_parsers/test_rst/test_field_lists.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_footnotes.py b/docutils/test/test_parsers/test_rst/test_footnotes.py index f748f707c..86b1bb2fa 100755 --- a/docutils/test/test_parsers/test_rst/test_footnotes.py +++ b/docutils/test/test_parsers/test_rst/test_footnotes.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_inline_markup.py b/docutils/test/test_parsers/test_rst/test_inline_markup.py index 83147e4f9..8d3f7873a 100755 --- a/docutils/test/test_parsers/test_rst/test_inline_markup.py +++ b/docutils/test/test_parsers/test_rst/test_inline_markup.py @@ -10,7 +10,7 @@ Interpreted text tests are in a separate module, test_interpreted.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_interpreted.py b/docutils/test/test_parsers/test_rst/test_interpreted.py index dc388e454..bcfcdd887 100755 --- a/docutils/test/test_parsers/test_rst/test_interpreted.py +++ b/docutils/test/test_parsers/test_rst/test_interpreted.py @@ -10,7 +10,7 @@ Tests for interpreted text in docutils/parsers/rst/states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.utils.code_analyzer import with_pygments diff --git a/docutils/test/test_parsers/test_rst/test_interpreted_fr.py b/docutils/test/test_parsers/test_rst/test_interpreted_fr.py index 2fa329c7f..3b67df7fc 100644 --- a/docutils/test/test_parsers/test_rst/test_interpreted_fr.py +++ b/docutils/test/test_parsers/test_rst/test_interpreted_fr.py @@ -11,7 +11,7 @@ Test not default/fallback language french. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_line_blocks.py b/docutils/test/test_parsers/test_rst/test_line_blocks.py index 7fce83d2b..f9e08c0f9 100755 --- a/docutils/test/test_parsers/test_rst/test_line_blocks.py +++ b/docutils/test/test_parsers/test_rst/test_line_blocks.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_line_length_limit.py b/docutils/test/test_parsers/test_rst/test_line_length_limit.py index 25f6d121c..f312e29c1 100755 --- a/docutils/test/test_parsers/test_rst/test_line_length_limit.py +++ b/docutils/test/test_parsers/test_rst/test_line_length_limit.py @@ -16,7 +16,7 @@ Interpreted text tests are in a separate module, test_interpreted.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_line_length_limit_default.py b/docutils/test/test_parsers/test_rst/test_line_length_limit_default.py index 10d07f8a5..a08012955 100755 --- a/docutils/test/test_parsers/test_rst/test_line_length_limit_default.py +++ b/docutils/test/test_parsers/test_rst/test_line_length_limit_default.py @@ -16,7 +16,7 @@ Interpreted text tests are in a separate module, test_interpreted.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_literal_blocks.py b/docutils/test/test_parsers/test_rst/test_literal_blocks.py index 2b29e3edd..84c42509e 100755 --- a/docutils/test/test_parsers/test_rst/test_literal_blocks.py +++ b/docutils/test/test_parsers/test_rst/test_literal_blocks.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_option_lists.py b/docutils/test/test_parsers/test_rst/test_option_lists.py index 265914f50..6ec899b6b 100755 --- a/docutils/test/test_parsers/test_rst/test_option_lists.py +++ b/docutils/test/test_parsers/test_rst/test_option_lists.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_outdenting.py b/docutils/test/test_parsers/test_rst/test_outdenting.py index ec8f499ee..2548c023e 100755 --- a/docutils/test/test_parsers/test_rst/test_outdenting.py +++ b/docutils/test/test_parsers/test_rst/test_outdenting.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_paragraphs.py b/docutils/test/test_parsers/test_rst/test_paragraphs.py index 96bef8a8b..9b5204252 100755 --- a/docutils/test/test_parsers/test_rst/test_paragraphs.py +++ b/docutils/test/test_parsers/test_rst/test_paragraphs.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_section_headers.py b/docutils/test/test_parsers/test_rst/test_section_headers.py index 4b11d2586..31d41e518 100755 --- a/docutils/test/test_parsers/test_rst/test_section_headers.py +++ b/docutils/test/test_parsers/test_rst/test_section_headers.py @@ -9,7 +9,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_source_line.py b/docutils/test/test_parsers/test_rst/test_source_line.py index aef1477d4..6044992b6 100644 --- a/docutils/test/test_parsers/test_rst/test_source_line.py +++ b/docutils/test/test_parsers/test_rst/test_source_line.py @@ -27,7 +27,7 @@ import os if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport # before importing docutils! +from test import DocutilsTestSupport # before importing docutils! from docutils.transforms.universal import ExposeInternals from docutils.parsers.rst import Parser diff --git a/docutils/test/test_parsers/test_rst/test_substitutions.py b/docutils/test/test_parsers/test_rst/test_substitutions.py index 374adeade..573f3d543 100755 --- a/docutils/test/test_parsers/test_rst/test_substitutions.py +++ b/docutils/test/test_parsers/test_rst/test_substitutions.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_tables.py b/docutils/test/test_parsers/test_rst/test_tables.py index 396712a60..dbc2522ea 100755 --- a/docutils/test/test_parsers/test_rst/test_tables.py +++ b/docutils/test/test_parsers/test_rst/test_tables.py @@ -12,7 +12,7 @@ import os if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_targets.py b/docutils/test/test_parsers/test_rst/test_targets.py index f2d386808..b66bac51c 100755 --- a/docutils/test/test_parsers/test_rst/test_targets.py +++ b/docutils/test/test_parsers/test_rst/test_targets.py @@ -10,7 +10,7 @@ Tests for states.py. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_parsers/test_rst/test_transitions.py b/docutils/test/test_parsers/test_rst/test_transitions.py index d0ae1acae..0d842b189 100755 --- a/docutils/test/test_parsers/test_rst/test_transitions.py +++ b/docutils/test/test_parsers/test_rst/test_transitions.py @@ -10,7 +10,7 @@ Tests for transition markers. if __name__ == '__main__': import __init__ # noqa: F401 -from test_parsers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_readers/__init__.py b/docutils/test/test_readers/__init__.py index e88b33c92..e69de29bb 100644 --- a/docutils/test/test_readers/__init__.py +++ b/docutils/test/test_readers/__init__.py @@ -1,14 +0,0 @@ -import os -import os.path -import sys - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) -prev = '' -while sys.path[0] != prev: - try: - import DocutilsTestSupport # noqa: F401 - break - except ImportError: - prev = sys.path[0] - sys.path[0] = os.path.dirname(prev) -sys.path.pop(0) diff --git a/docutils/test/test_readers/test_get_reader_class.py b/docutils/test/test_readers/test_get_reader_class.py index 5aaac955c..ba5c572ae 100644 --- a/docutils/test/test_readers/test_get_reader_class.py +++ b/docutils/test/test_readers/test_get_reader_class.py @@ -11,7 +11,7 @@ test get_reader_class if __name__ == '__main__': import __init__ # noqa: F401 -from test_readers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.readers import get_reader_class diff --git a/docutils/test/test_readers/test_pep/__init__.py b/docutils/test/test_readers/test_pep/__init__.py index e88b33c92..e69de29bb 100644 --- a/docutils/test/test_readers/test_pep/__init__.py +++ b/docutils/test/test_readers/test_pep/__init__.py @@ -1,14 +0,0 @@ -import os -import os.path -import sys - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) -prev = '' -while sys.path[0] != prev: - try: - import DocutilsTestSupport # noqa: F401 - break - except ImportError: - prev = sys.path[0] - sys.path[0] = os.path.dirname(prev) -sys.path.pop(0) diff --git a/docutils/test/test_readers/test_pep/test_inline_markup.py b/docutils/test/test_readers/test_pep/test_inline_markup.py index b2a5ea77f..c70271eae 100755 --- a/docutils/test/test_readers/test_pep/test_inline_markup.py +++ b/docutils/test/test_readers/test_pep/test_inline_markup.py @@ -10,7 +10,7 @@ Tests for inline markup in PEPs (readers/pep.py). if __name__ == '__main__': import __init__ # noqa: F401 -from test_readers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_readers/test_pep/test_rfc2822.py b/docutils/test/test_readers/test_pep/test_rfc2822.py index 9e287a5f1..24597e20e 100755 --- a/docutils/test/test_readers/test_pep/test_rfc2822.py +++ b/docutils/test/test_readers/test_pep/test_rfc2822.py @@ -10,7 +10,7 @@ Tests for RFC-2822 headers in PEPs (readers/pep.py). if __name__ == '__main__': import __init__ # noqa: F401 -from test_readers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_transforms/__init__.py b/docutils/test/test_transforms/__init__.py index e88b33c92..e69de29bb 100644 --- a/docutils/test/test_transforms/__init__.py +++ b/docutils/test/test_transforms/__init__.py @@ -1,14 +0,0 @@ -import os -import os.path -import sys - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) -prev = '' -while sys.path[0] != prev: - try: - import DocutilsTestSupport # noqa: F401 - break - except ImportError: - prev = sys.path[0] - sys.path[0] = os.path.dirname(prev) -sys.path.pop(0) diff --git a/docutils/test/test_transforms/itest_hyperlinks_de.py b/docutils/test/test_transforms/itest_hyperlinks_de.py index 88d185c21..4285ceb10 100644 --- a/docutils/test/test_transforms/itest_hyperlinks_de.py +++ b/docutils/test/test_transforms/itest_hyperlinks_de.py @@ -21,7 +21,7 @@ TODO: This test fails currently when run as part of "alltests" because if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.references import ( PropagateTargets, AnonymousHyperlinks, IndirectHyperlinks, ExternalTargets, InternalTargets, DanglingReferences) diff --git a/docutils/test/test_transforms/test_class.py b/docutils/test/test_transforms/test_class.py index e4fea9444..e9e835e6a 100755 --- a/docutils/test/test_transforms/test_class.py +++ b/docutils/test/test_transforms/test_class.py @@ -10,7 +10,7 @@ Tests for `docutils.transforms.misc.ClassAttribute`. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_contents.py b/docutils/test/test_transforms/test_contents.py index f7393174b..2aca86032 100755 --- a/docutils/test/test_transforms/test_contents.py +++ b/docutils/test/test_transforms/test_contents.py @@ -11,7 +11,7 @@ Tests for `docutils.transforms.parts.Contents` (via if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.references import Substitutions from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_docinfo.py b/docutils/test/test_transforms/test_docinfo.py index 0f8d47a98..1d3945245 100755 --- a/docutils/test/test_transforms/test_docinfo.py +++ b/docutils/test/test_transforms/test_docinfo.py @@ -9,7 +9,7 @@ Tests for docutils.transforms.frontmatter.DocInfo. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.frontmatter import DocInfo from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_doctitle.py b/docutils/test/test_transforms/test_doctitle.py index 5735de5f9..e53bfc29e 100755 --- a/docutils/test/test_transforms/test_doctitle.py +++ b/docutils/test/test_transforms/test_doctitle.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.frontmatter.DocTitle. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.frontmatter import DocTitle, SectionSubTitle from docutils.parsers.rst import Parser, Directive from docutils.parsers.rst.directives import register_directive diff --git a/docutils/test/test_transforms/test_expose_internals.py b/docutils/test/test_transforms/test_expose_internals.py index 5a3e4f0b9..66debcfa1 100755 --- a/docutils/test/test_transforms/test_expose_internals.py +++ b/docutils/test/test_transforms/test_expose_internals.py @@ -10,7 +10,7 @@ Test module for universal.ExposeInternals transform. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport # before importing docutils! +from test import DocutilsTestSupport # before importing docutils! from docutils.transforms.universal import ExposeInternals from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_filter.py b/docutils/test/test_transforms/test_filter.py index 876729e77..b498cd7aa 100755 --- a/docutils/test/test_transforms/test_filter.py +++ b/docutils/test/test_transforms/test_filter.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.components.Filter. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_filter_messages.py b/docutils/test/test_transforms/test_filter_messages.py index ac360d719..e5a1f1cba 100644 --- a/docutils/test/test_transforms/test_filter_messages.py +++ b/docutils/test/test_transforms/test_filter_messages.py @@ -18,7 +18,7 @@ Tests for docutils.transforms.universal.FilterMessages. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.universal import Messages, FilterMessages from docutils.transforms.references import Substitutions from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_footnotes.py b/docutils/test/test_transforms/test_footnotes.py index 09bd944f9..f5a01391b 100755 --- a/docutils/test/test_transforms/test_footnotes.py +++ b/docutils/test/test_transforms/test_footnotes.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.references.Footnotes. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.references import Footnotes from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_hyperlinks.py b/docutils/test/test_transforms/test_hyperlinks.py index dab2d85b2..d66e47bd1 100755 --- a/docutils/test/test_transforms/test_hyperlinks.py +++ b/docutils/test/test_transforms/test_hyperlinks.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.references.Hyperlinks. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.references import PropagateTargets, \ AnonymousHyperlinks, IndirectHyperlinks, ExternalTargets, \ InternalTargets, DanglingReferences diff --git a/docutils/test/test_transforms/test_messages.py b/docutils/test/test_transforms/test_messages.py index 8d163f7a5..e8d1ee1dc 100755 --- a/docutils/test/test_transforms/test_messages.py +++ b/docutils/test/test_transforms/test_messages.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.universal.Messages. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.universal import Messages from docutils.transforms.references import Substitutions from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_peps.py b/docutils/test/test_transforms/test_peps.py index 5291ba681..76362f544 100755 --- a/docutils/test/test_transforms/test_peps.py +++ b/docutils/test/test_transforms/test_peps.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.peps. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.peps import TargetNotes from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_sectnum.py b/docutils/test/test_transforms/test_sectnum.py index 37b6133be..c23b19728 100755 --- a/docutils/test/test_transforms/test_sectnum.py +++ b/docutils/test/test_transforms/test_sectnum.py @@ -11,7 +11,7 @@ Tests for `docutils.transforms.parts.SectNum` (via if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.references import Substitutions from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_smartquotes.py b/docutils/test/test_transforms/test_smartquotes.py index 7e3917d02..11f4fb339 100644 --- a/docutils/test/test_transforms/test_smartquotes.py +++ b/docutils/test/test_transforms/test_smartquotes.py @@ -17,7 +17,7 @@ Test module for universal.SmartQuotes transform. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport # before importing docutils! +from test import DocutilsTestSupport # before importing docutils! from docutils.transforms.universal import SmartQuotes from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_strip_comments.py b/docutils/test/test_transforms/test_strip_comments.py index 7fe5060bc..8f374741b 100755 --- a/docutils/test/test_transforms/test_strip_comments.py +++ b/docutils/test/test_transforms/test_strip_comments.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.universal.StripComments. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.universal import StripComments from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_strip_elements_with_class.py b/docutils/test/test_transforms/test_strip_elements_with_class.py index a39ef146c..87b4b4213 100644 --- a/docutils/test/test_transforms/test_strip_elements_with_class.py +++ b/docutils/test/test_transforms/test_strip_elements_with_class.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.universal.StripClassesAndElements. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.parsers.rst import Parser from docutils.transforms.universal import StripClassesAndElements diff --git a/docutils/test/test_transforms/test_substitution_expansion_length_limit.py b/docutils/test/test_transforms/test_substitution_expansion_length_limit.py index 8197717d7..1ecb2bbdf 100644 --- a/docutils/test/test_transforms/test_substitution_expansion_length_limit.py +++ b/docutils/test/test_transforms/test_substitution_expansion_length_limit.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.references.Substitutions. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.references import Substitutions from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_substitutions.py b/docutils/test/test_transforms/test_substitutions.py index 1ee78c012..044eac24f 100755 --- a/docutils/test/test_transforms/test_substitutions.py +++ b/docutils/test/test_transforms/test_substitutions.py @@ -10,7 +10,7 @@ Tests for docutils.transforms.references.Substitutions. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.references import Substitutions from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_target_notes.py b/docutils/test/test_transforms/test_target_notes.py index a2895e0fe..4c0cd3232 100755 --- a/docutils/test/test_transforms/test_target_notes.py +++ b/docutils/test/test_transforms/test_target_notes.py @@ -11,7 +11,7 @@ Tests for `docutils.transforms.references.TargetNotes` (via if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.transforms.references import (PropagateTargets, AnonymousHyperlinks, IndirectHyperlinks, ExternalTargets, InternalTargets, DanglingReferences) diff --git a/docutils/test/test_transforms/test_transitions.py b/docutils/test/test_transforms/test_transitions.py index b67eda541..bde261b84 100755 --- a/docutils/test/test_transforms/test_transitions.py +++ b/docutils/test/test_transforms/test_transitions.py @@ -10,7 +10,7 @@ Test module for misc.Transitions transform. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport # before importing docutils! +from test import DocutilsTestSupport # before importing docutils! from docutils.transforms.misc import Transitions from docutils.parsers.rst import Parser diff --git a/docutils/test/test_transforms/test_writer_aux.py b/docutils/test/test_transforms/test_writer_aux.py index 138653958..c2e62b3c9 100755 --- a/docutils/test/test_transforms/test_writer_aux.py +++ b/docutils/test/test_transforms/test_writer_aux.py @@ -10,7 +10,7 @@ Test module for writer_aux transforms. if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport # before importing docutils! +from test import DocutilsTestSupport # before importing docutils! from docutils.transforms import writer_aux from docutils.parsers.rst import Parser diff --git a/docutils/test/test_writers/__init__.py b/docutils/test/test_writers/__init__.py index e88b33c92..e69de29bb 100644 --- a/docutils/test/test_writers/__init__.py +++ b/docutils/test/test_writers/__init__.py @@ -1,14 +0,0 @@ -import os -import os.path -import sys - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) -prev = '' -while sys.path[0] != prev: - try: - import DocutilsTestSupport # noqa: F401 - break - except ImportError: - prev = sys.path[0] - sys.path[0] = os.path.dirname(prev) -sys.path.pop(0) diff --git a/docutils/test/test_writers/test_docutils_xml.py b/docutils/test/test_writers/test_docutils_xml.py index 3aedcdd43..aa376112a 100755 --- a/docutils/test/test_writers/test_docutils_xml.py +++ b/docutils/test/test_writers/test_docutils_xml.py @@ -17,7 +17,7 @@ Test for docutils XML writer. if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport # before importing docutils! +from test import DocutilsTestSupport # before importing docutils! import docutils import docutils.core diff --git a/docutils/test/test_writers/test_get_writer_class.py b/docutils/test/test_writers/test_get_writer_class.py index 581bfdeb8..14c127df2 100644 --- a/docutils/test/test_writers/test_get_writer_class.py +++ b/docutils/test/test_writers/test_get_writer_class.py @@ -11,7 +11,7 @@ test get_writer_class if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils.writers import get_writer_class diff --git a/docutils/test/test_writers/test_html4css1_misc.py b/docutils/test/test_writers/test_html4css1_misc.py index b3045217a..72eb83ba2 100755 --- a/docutils/test/test_writers/test_html4css1_misc.py +++ b/docutils/test/test_writers/test_html4css1_misc.py @@ -12,7 +12,7 @@ import os if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils import core diff --git a/docutils/test/test_writers/test_html4css1_parts.py b/docutils/test/test_writers/test_html4css1_parts.py index 9f8afeddb..bfe4484a4 100755 --- a/docutils/test/test_writers/test_html4css1_parts.py +++ b/docutils/test/test_writers/test_html4css1_parts.py @@ -14,7 +14,7 @@ standard values, and any entries with empty values. if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_writers/test_html4css1_template.py b/docutils/test/test_writers/test_html4css1_template.py index 96b6e05a7..3ddaf17b8 100755 --- a/docutils/test/test_writers/test_html4css1_template.py +++ b/docutils/test/test_writers/test_html4css1_template.py @@ -13,7 +13,7 @@ import platform if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_writers/test_html5_polyglot_misc.py b/docutils/test/test_writers/test_html5_polyglot_misc.py index d39edbd75..e1b60a4a1 100644 --- a/docutils/test/test_writers/test_html5_polyglot_misc.py +++ b/docutils/test/test_writers/test_html5_polyglot_misc.py @@ -12,7 +12,7 @@ import os if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils import core diff --git a/docutils/test/test_writers/test_html5_template.py b/docutils/test/test_writers/test_html5_template.py index 99c13b91f..cd8c5fbae 100644 --- a/docutils/test/test_writers/test_html5_template.py +++ b/docutils/test/test_writers/test_html5_template.py @@ -13,7 +13,7 @@ import platform if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_writers/test_latex2e.py b/docutils/test/test_writers/test_latex2e.py index 4b59b1882..b0066ffa0 100755 --- a/docutils/test/test_writers/test_latex2e.py +++ b/docutils/test/test_writers/test_latex2e.py @@ -11,7 +11,7 @@ import string if __name__ == '__main__': import __init__ # noqa: F401 -from test_transforms import DocutilsTestSupport # before importing docutils! +from test import DocutilsTestSupport # before importing docutils! def suite(): diff --git a/docutils/test/test_writers/test_latex2e_misc.py b/docutils/test/test_writers/test_latex2e_misc.py index 87c28b385..e1125de8a 100644 --- a/docutils/test/test_writers/test_latex2e_misc.py +++ b/docutils/test/test_writers/test_latex2e_misc.py @@ -18,7 +18,7 @@ Miscellaneous LaTeX writer tests. if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport from docutils import core contents_test_input = """\ diff --git a/docutils/test/test_writers/test_manpage.py b/docutils/test/test_writers/test_manpage.py index 37eacaf00..a83a89562 100644 --- a/docutils/test/test_writers/test_manpage.py +++ b/docutils/test/test_writers/test_manpage.py @@ -10,7 +10,7 @@ Tests for manpage writer. if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_writers/test_null.py b/docutils/test/test_writers/test_null.py index 3f7d6494f..975e2464b 100755 --- a/docutils/test/test_writers/test_null.py +++ b/docutils/test/test_writers/test_null.py @@ -10,7 +10,7 @@ Test for Null writer. if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_writers/test_odt.py b/docutils/test/test_writers/test_odt.py index 2981e5556..6012146af 100755 --- a/docutils/test/test_writers/test_odt.py +++ b/docutils/test/test_writers/test_odt.py @@ -37,7 +37,7 @@ from io import BytesIO if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport import docutils import docutils.core diff --git a/docutils/test/test_writers/test_pseudoxml.py b/docutils/test/test_writers/test_pseudoxml.py index 723c75e52..8b307bd61 100755 --- a/docutils/test/test_writers/test_pseudoxml.py +++ b/docutils/test/test_writers/test_pseudoxml.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# $Id: test_pseudoxml.py 8481 2020-01-31 08:17:24Z milde $ +# $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> # Copyright: This module has been placed in the public domain. @@ -10,7 +10,7 @@ Test for pseudo-XML writer. if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): diff --git a/docutils/test/test_writers/test_s5.py b/docutils/test/test_writers/test_s5.py index e41f8d5f1..a21d01b19 100755 --- a/docutils/test/test_writers/test_s5.py +++ b/docutils/test/test_writers/test_s5.py @@ -13,7 +13,7 @@ import platform if __name__ == '__main__': import __init__ # noqa: F401 -from test_writers import DocutilsTestSupport +from test import DocutilsTestSupport def suite(): |