Restore support for running tests stand-alone.

After the switch to absolute imports, individual test could no
longer be run in from their directory (import error).
This patch makes the `pythonpath` expansion in the test
subdirectories' ``__init__`` files functional again.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8481 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

96 files changed, 282 insertions, 105 deletions

diff --git a/docutils/test/test_parsers/test_get_parser_class.py b/docutils/test/test_parsers/test_get_parser_class.py
index 978dd340c..0ae688d3d 100644
--- a/docutils/test/test_parsers/test_get_parser_class.py
+++ b/docutils/test/test_parsers/test_get_parser_class.py
@@ -10,7 +10,9 @@ test get_parser_class
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 from docutils.parsers import get_parser_class
 
 class GetParserClassTestCase(DocutilsTestSupport.StandardTestCase):
diff --git a/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py b/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py
index 7042e8996..f52d6d549 100755
--- a/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py
+++ b/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py
@@ -10,7 +10,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.SimpleTableParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_TableParser.py b/docutils/test/test_parsers/test_rst/test_TableParser.py
index 82e3caa95..97d280d4a 100755
--- a/docutils/test/test_parsers/test_rst/test_TableParser.py
+++ b/docutils/test/test_parsers/test_rst/test_TableParser.py
@@ -10,7 +10,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.GridTableParserTestSuite()
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 925e68467..870d5e57d 100755
--- a/docutils/test/test_parsers/test_rst/test_block_quotes.py
+++ b/docutils/test/test_parsers/test_rst/test_block_quotes.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 5390218ce..8817bbac9 100755
--- a/docutils/test/test_parsers/test_rst/test_bullet_lists.py
+++ b/docutils/test/test_parsers/test_rst/test_bullet_lists.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 3503b6faf..0126abd11 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
@@ -13,7 +13,9 @@ Experimental.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite(suite_settings={'character_level_inline_markup': True})
diff --git a/docutils/test/test_parsers/test_rst/test_citations.py b/docutils/test/test_parsers/test_rst/test_citations.py
index 0bccbd984..f57a06b9c 100755
--- a/docutils/test/test_parsers/test_rst/test_citations.py
+++ b/docutils/test/test_parsers/test_rst/test_citations.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_comments.py b/docutils/test/test_parsers/test_rst/test_comments.py
index 16fce7036..5e97a2a58 100755
--- a/docutils/test/test_parsers/test_rst/test_comments.py
+++ b/docutils/test/test_parsers/test_rst/test_comments.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 23cfd0502..e520eebe6 100755
--- a/docutils/test/test_parsers/test_rst/test_definition_lists.py
+++ b/docutils/test/test_parsers/test_rst/test_definition_lists.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 8aa142001..f6a38e3c5 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
@@ -9,10 +9,9 @@ Tests for admonitions.py directives.
 """
 from __future__ import absolute_import
 
-try:
-    from . import DocutilsTestSupport
-except ValueError: # when running as stand-alone test
-    from __init__ import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 3d650e73b..b4588490f 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
@@ -9,10 +9,9 @@ Tests for admonitions.py directives in German document.
 """
 from __future__ import absolute_import
 
-try:
-    from . import DocutilsTestSupport
-except ValueError: # when running as stand-alone test
-    from __init__ import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     settings = {'language_code': 'de'}
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 f29e9f72f..4fec927e6 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
@@ -9,10 +9,9 @@ Tests for admonition directives with local language module.
 """
 from __future__ import absolute_import
 
-try:
-    from . import DocutilsTestSupport
-except ValueError: # when running as stand-alone test
-    from __init__ import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     settings = {'language_code': 'local-dummy-lang',
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 67d54de0d..3026831b2 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
@@ -10,7 +10,9 @@ Tests for the block quote directives "epigraph", "highlights", and
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 e5ccb590b..158b406d4 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
@@ -9,7 +9,9 @@ Tests for the 'class' directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 50040c967..c9ee2c014 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
@@ -9,7 +9,9 @@ Test the 'code' directive in parsers/rst/directives/body.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 from docutils.utils.code_analyzer import with_pygments
 
 def suite():
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 0574df6b0..22541f534 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
@@ -9,7 +9,9 @@ Test the 'code' directive in body.py with syntax_highlight = 'long'.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 from docutils.utils.code_analyzer import with_pygments
 
 def suite():
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 8e9474720..99bbbe554 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
@@ -9,7 +9,9 @@ Test the 'code' directive in body.py with syntax_highlight = 'none'.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite(suite_settings={'syntax_highlight':'none'})
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 45879f4ff..bee284237 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
@@ -9,7 +9,9 @@ Tests for the 'compound' directive from body.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 53331ae5b..36ed47c06 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
@@ -9,7 +9,9 @@ Tests for the 'container' directive from body.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 8db10dfa3..3f804cd22 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
@@ -9,7 +9,9 @@ Tests for parts.py contents directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 0ff5fbc6b..24cb3129d 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
@@ -9,7 +9,9 @@ Tests for the misc.py "date" directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 import time
 
 from docutils.utils.error_reporting import locale_encoding
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 a8a425663..bdeedf604 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
@@ -9,7 +9,9 @@ Tests for the "header" & "footer" directives.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 8be8b1414..6e382d583 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
@@ -9,7 +9,9 @@ Tests for misc.py "default-role" directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 c6810e63a..842f567ab 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
@@ -9,7 +9,9 @@ Tests for images.py figure directives.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 f4cdf63da..c305d5f7c 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
@@ -9,7 +9,9 @@ Tests for images.py image directives.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 from docutils.nodes import reprunicode
 
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 8401732f4..b8ff49571 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
@@ -11,7 +11,9 @@ from __future__ import absolute_import
 
 import os.path
 import sys
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 from docutils.parsers.rst import states
 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 b8ef1e036..e96fecc67 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
@@ -9,7 +9,9 @@ Tests for the body.py 'line-block' directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 5571fb819..458d5182a 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
@@ -9,7 +9,9 @@ Tests for the 'math' directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 2b893b6c7..1ded6c5eb 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
@@ -9,7 +9,9 @@ Tests for html meta directives.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 a7a1fedb4..421ecd29d 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
@@ -9,7 +9,9 @@ Tests for the body.py 'parsed-literal' directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 06d7b09da..1794d564d 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,9 @@ from __future__ import absolute_import
 import os.path
 import sys
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 e89bf9474..06abf01b7 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
@@ -9,7 +9,9 @@ Tests for misc.py "replace" directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 670569b9a..25641b820 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
@@ -10,7 +10,9 @@ Test in french (not default/fallback language).
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 41b52adbb..b1b8c130f 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
@@ -9,7 +9,9 @@ Tests for misc.py "role" directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 bfe220c58..ccd62f74a 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
@@ -9,7 +9,9 @@ Tests for the "rubric" directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 fb9305f10..24ba0dbb2 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
@@ -9,7 +9,9 @@ Tests for the 'sectnum' directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 c3ee15a34..1029eb12a 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
@@ -9,7 +9,9 @@ Tests for the "sidebar" directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 94befd11d..e931f8e35 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,9 @@ import sys
 import csv
 import platform
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 from docutils.parsers.rst.directives import tables
 
 
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 8f50f6723..71346441b 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
@@ -9,7 +9,9 @@ Tests for the target-notes directives.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 da48107ff..59718c2b0 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
@@ -9,7 +9,9 @@ Tests for misc.py test directives.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 8b2a005ae..002422fd0 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
@@ -9,7 +9,9 @@ Tests for the 'title' directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 c1743f508..048d4e821 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
@@ -9,7 +9,9 @@ Tests for the "topic" directive.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 3ac5aa394..630e653a1 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,9 @@ from __future__ import absolute_import
 
 import sys
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 
 if sys.version_info >= (3, 0):
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 3ada66a12..198d4a821 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
@@ -9,7 +9,9 @@ Tests for unknown directives.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 ca6a58ded..a8ab0b160 100755
--- a/docutils/test/test_parsers/test_rst/test_doctest_blocks.py
+++ b/docutils/test/test_parsers/test_rst/test_doctest_blocks.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 22995ee3f..9529b45d7 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
@@ -10,7 +10,9 @@ Tests for East Asian text with double-width characters.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 import unicodedata
 
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 56407029d..7a90cd3bb 100755
--- a/docutils/test/test_parsers/test_rst/test_enumerated_lists.py
+++ b/docutils/test/test_parsers/test_rst/test_enumerated_lists.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 192454679..7af8c1dab 100755
--- a/docutils/test/test_parsers/test_rst/test_field_lists.py
+++ b/docutils/test/test_parsers/test_rst/test_field_lists.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 596f51c54..219f153ce 100755
--- a/docutils/test/test_parsers/test_rst/test_footnotes.py
+++ b/docutils/test/test_parsers/test_rst/test_footnotes.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 3d52d0057..18e6e81e4 100755
--- a/docutils/test/test_parsers/test_rst/test_inline_markup.py
+++ b/docutils/test/test_parsers/test_rst/test_inline_markup.py
@@ -11,7 +11,9 @@ Interpreted text tests are in a separate module, test_interpreted.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 369655be1..8ec44bc30 100755
--- a/docutils/test/test_parsers/test_rst/test_interpreted.py
+++ b/docutils/test/test_parsers/test_rst/test_interpreted.py
@@ -9,7 +9,9 @@ Tests for interpreted text in docutils/parsers/rst/states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 046ab1517..c08248467 100644
--- a/docutils/test/test_parsers/test_rst/test_interpreted_fr.py
+++ b/docutils/test/test_parsers/test_rst/test_interpreted_fr.py
@@ -10,7 +10,9 @@ Test not default/fallback language french.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 d674a45cc..79598c086 100755
--- a/docutils/test/test_parsers/test_rst/test_line_blocks.py
+++ b/docutils/test/test_parsers/test_rst/test_line_blocks.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 e876b99e0..5b64e014f 100755
--- a/docutils/test/test_parsers/test_rst/test_literal_blocks.py
+++ b/docutils/test/test_parsers/test_rst/test_literal_blocks.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 df0a99f03..c5d1b9251 100755
--- a/docutils/test/test_parsers/test_rst/test_option_lists.py
+++ b/docutils/test/test_parsers/test_rst/test_option_lists.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 631aae7df..c684c713b 100755
--- a/docutils/test/test_parsers/test_rst/test_outdenting.py
+++ b/docutils/test/test_parsers/test_rst/test_outdenting.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 713235727..754f315eb 100755
--- a/docutils/test/test_parsers/test_rst/test_paragraphs.py
+++ b/docutils/test/test_parsers/test_rst/test_paragraphs.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 3428f77ed..5563609f0 100755
--- a/docutils/test/test_parsers/test_rst/test_section_headers.py
+++ b/docutils/test/test_parsers/test_rst/test_section_headers.py
@@ -10,7 +10,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 
 def suite():
diff --git a/docutils/test/test_parsers/test_rst/test_substitutions.py b/docutils/test/test_parsers/test_rst/test_substitutions.py
index a4b9595bb..25874d36b 100755
--- a/docutils/test/test_parsers/test_rst/test_substitutions.py
+++ b/docutils/test/test_parsers/test_rst/test_substitutions.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 9859060ec..1524cf665 100755
--- a/docutils/test/test_parsers/test_rst/test_tables.py
+++ b/docutils/test/test_parsers/test_rst/test_tables.py
@@ -11,7 +11,9 @@ from __future__ import absolute_import
 
 import os
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 78c44bb3c..560c50b89 100755
--- a/docutils/test/test_parsers/test_rst/test_targets.py
+++ b/docutils/test/test_parsers/test_rst/test_targets.py
@@ -9,7 +9,9 @@ Tests for states.py.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers 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 de1f07534..b9661f3b1 100755
--- a/docutils/test/test_parsers/test_rst/test_transitions.py
+++ b/docutils/test/test_parsers/test_rst/test_transitions.py
@@ -9,7 +9,9 @@ Tests for transition markers.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_parsers import DocutilsTestSupport
 
 
 def suite():
diff --git a/docutils/test/test_readers/test_get_reader_class.py b/docutils/test/test_readers/test_get_reader_class.py
index b23799104..66466e32a 100644
--- a/docutils/test/test_readers/test_get_reader_class.py
+++ b/docutils/test/test_readers/test_get_reader_class.py
@@ -10,7 +10,9 @@ test get_reader_class
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_readers import DocutilsTestSupport
 from docutils.readers import get_reader_class
 
 
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 8bcc66542..10f1a63a8 100755
--- a/docutils/test/test_readers/test_pep/test_inline_markup.py
+++ b/docutils/test/test_readers/test_pep/test_inline_markup.py
@@ -9,7 +9,9 @@ Tests for inline markup in PEPs (readers/pep.py).
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_readers 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 b40c740cf..5b20af50f 100755
--- a/docutils/test/test_readers/test_pep/test_rfc2822.py
+++ b/docutils/test/test_readers/test_pep/test_rfc2822.py
@@ -9,7 +9,9 @@ Tests for RFC-2822 headers in PEPs (readers/pep.py).
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_readers import DocutilsTestSupport
 
 
 def suite():
diff --git a/docutils/test/test_transforms/test___init__.py b/docutils/test/test_transforms/test___init__.py
index 1cd20f25c..ea74ead64 100755
--- a/docutils/test/test_transforms/test___init__.py
+++ b/docutils/test/test_transforms/test___init__.py
@@ -11,7 +11,9 @@ from __future__ import absolute_import
 
 import unittest
 
-from . import DocutilsTestSupport # must be imported before docutils
+if __name__ == '__main__':
+    import __init__
+from test_transforms import DocutilsTestSupport # before importing docutils!
 from docutils import transforms, utils
 
 
diff --git a/docutils/test/test_transforms/test_class.py b/docutils/test/test_transforms/test_class.py
index d2782939b..64f015051 100755
--- a/docutils/test/test_transforms/test_class.py
+++ b/docutils/test/test_transforms/test_class.py
@@ -9,7 +9,9 @@ Tests for `docutils.transforms.misc.ClassAttribute`.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 9d45b5d94..1d5e66ce1 100755
--- a/docutils/test/test_transforms/test_contents.py
+++ b/docutils/test/test_transforms/test_contents.py
@@ -10,7 +10,9 @@ Tests for `docutils.transforms.parts.Contents` (via
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 9dc13364c..5f945ae64 100755
--- a/docutils/test/test_transforms/test_docinfo.py
+++ b/docutils/test/test_transforms/test_docinfo.py
@@ -10,7 +10,9 @@ Tests for docutils.transforms.frontmatter.DocInfo.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 1bfed2aea..ac6bd9153 100755
--- a/docutils/test/test_transforms/test_doctitle.py
+++ b/docutils/test/test_transforms/test_doctitle.py
@@ -9,7 +9,9 @@ Tests for docutils.transforms.frontmatter.DocTitle.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 558f71547..5a9ec4cbf 100755
--- a/docutils/test/test_transforms/test_expose_internals.py
+++ b/docutils/test/test_transforms/test_expose_internals.py
@@ -10,7 +10,9 @@ Test module for universal.ExposeInternals transform.
 from __future__ import absolute_import
 
 
-from . import DocutilsTestSupport # must be imported before docutils
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 aafc7e34b..363f57bbe 100755
--- a/docutils/test/test_transforms/test_filter.py
+++ b/docutils/test/test_transforms/test_filter.py
@@ -9,7 +9,9 @@ Tests for docutils.transforms.components.Filter.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms import DocutilsTestSupport
 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 5920215df..a7104f541 100755
--- a/docutils/test/test_transforms/test_footnotes.py
+++ b/docutils/test/test_transforms/test_footnotes.py
@@ -9,7 +9,9 @@ Tests for docutils.transforms.references.Footnotes.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 6691d918e..cb388a77e 100755
--- a/docutils/test/test_transforms/test_hyperlinks.py
+++ b/docutils/test/test_transforms/test_hyperlinks.py
@@ -9,7 +9,9 @@ Tests for docutils.transforms.references.Hyperlinks.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 7da42d9f3..dcb540a0a 100755
--- a/docutils/test/test_transforms/test_messages.py
+++ b/docutils/test/test_transforms/test_messages.py
@@ -9,7 +9,9 @@ Tests for docutils.transforms.universal.Messages.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 2776a774a..7f17ea69c 100755
--- a/docutils/test/test_transforms/test_peps.py
+++ b/docutils/test/test_transforms/test_peps.py
@@ -9,7 +9,9 @@ Tests for docutils.transforms.peps.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 111f7be14..3f80b61f8 100755
--- a/docutils/test/test_transforms/test_sectnum.py
+++ b/docutils/test/test_transforms/test_sectnum.py
@@ -10,7 +10,9 @@ Tests for `docutils.transforms.parts.SectNum` (via
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 4e17c8b89..10bec27f7 100644
--- a/docutils/test/test_transforms/test_smartquotes.py
+++ b/docutils/test/test_transforms/test_smartquotes.py
@@ -20,7 +20,7 @@ from __future__ import absolute_import
 
 if __name__ == '__main__':
     import __init__
-from test_transforms import DocutilsTestSupport  # must be imported before docutils
+from test_transforms 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 12226dee0..563894054 100755
--- a/docutils/test/test_transforms/test_strip_comments.py
+++ b/docutils/test/test_transforms/test_strip_comments.py
@@ -9,7 +9,9 @@ Tests for docutils.transforms.universal.StripComments.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 0a87d39fb..d15bf03c7 100644
--- a/docutils/test/test_transforms/test_strip_elements_with_class.py
+++ b/docutils/test/test_transforms/test_strip_elements_with_class.py
@@ -9,7 +9,9 @@ Tests for docutils.transforms.universal.StripClassesAndElements.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms import DocutilsTestSupport
 from docutils.parsers.rst import Parser
 from docutils.transforms.universal import StripClassesAndElements
 
diff --git a/docutils/test/test_transforms/test_substitutions.py b/docutils/test/test_transforms/test_substitutions.py
index 330d70a29..1bb0634d2 100755
--- a/docutils/test/test_transforms/test_substitutions.py
+++ b/docutils/test/test_transforms/test_substitutions.py
@@ -9,7 +9,9 @@ Tests for docutils.transforms.references.Substitutions.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 238a6df54..cfd22a858 100755
--- a/docutils/test/test_transforms/test_target_notes.py
+++ b/docutils/test/test_transforms/test_target_notes.py
@@ -10,7 +10,9 @@ Tests for `docutils.transforms.references.TargetNotes` (via
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_transforms import DocutilsTestSupport
 from docutils.transforms.references import PropagateTargets, \
      AnonymousHyperlinks, IndirectHyperlinks, ExternalTargets, \
      InternalTargets, DanglingReferences, Footnotes
diff --git a/docutils/test/test_transforms/test_transitions.py b/docutils/test/test_transforms/test_transitions.py
index d2284d336..318c8b1e6 100755
--- a/docutils/test/test_transforms/test_transitions.py
+++ b/docutils/test/test_transforms/test_transitions.py
@@ -9,7 +9,9 @@ Test module for misc.Transitions transform.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport # must be imported before docutils
+if __name__ == '__main__':
+    import __init__
+from test_transforms 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 16540ff37..751b3fbc4 100755
--- a/docutils/test/test_transforms/test_writer_aux.py
+++ b/docutils/test/test_transforms/test_writer_aux.py
@@ -9,7 +9,9 @@ Test module for writer_aux transforms.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport # must be imported before docutils
+if __name__ == '__main__':
+    import __init__
+from test_transforms import DocutilsTestSupport # before importing docutils!
 from docutils.transforms import writer_aux
 from docutils.parsers.rst import Parser
 
diff --git a/docutils/test/test_writers/test_docutils_xml.py b/docutils/test/test_writers/test_docutils_xml.py
index abab5742a..86373ff30 100755
--- a/docutils/test/test_writers/test_docutils_xml.py
+++ b/docutils/test/test_writers/test_docutils_xml.py
@@ -17,7 +17,9 @@ from __future__ import absolute_import
 
 import sys
 
-from . import DocutilsTestSupport # must be imported before docutils
+if __name__ == '__main__':
+    import __init__
+from test_writers 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 4fd448be4..c9720e371 100644
--- a/docutils/test/test_writers/test_get_writer_class.py
+++ b/docutils/test/test_writers/test_get_writer_class.py
@@ -10,7 +10,9 @@ test get_writer_class
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_writers import DocutilsTestSupport
 from docutils.writers import get_writer_class
 
 
diff --git a/docutils/test/test_writers/test_html4css1_parts.py b/docutils/test/test_writers/test_html4css1_parts.py
index 866ee9858..f2a2dcd57 100755
--- a/docutils/test/test_writers/test_html4css1_parts.py
+++ b/docutils/test/test_writers/test_html4css1_parts.py
@@ -13,7 +13,9 @@ standard values, and any entries with empty values.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_writers import DocutilsTestSupport
 from docutils import core
 
 
diff --git a/docutils/test/test_writers/test_html4css1_template.py b/docutils/test/test_writers/test_html4css1_template.py
index 128ef4c4a..92b4cb2b3 100755
--- a/docutils/test/test_writers/test_html4css1_template.py
+++ b/docutils/test/test_writers/test_html4css1_template.py
@@ -12,7 +12,9 @@ from __future__ import absolute_import
 import os
 import platform
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_writers 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 9ae3b6895..b0cecb91a 100644
--- a/docutils/test/test_writers/test_html5_polyglot_misc.py
+++ b/docutils/test/test_writers/test_html5_polyglot_misc.py
@@ -13,7 +13,9 @@ from __future__ import absolute_import
 
 import os
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_writers import DocutilsTestSupport
 from docutils import core
 
 
diff --git a/docutils/test/test_writers/test_html5_polyglot_parts.py b/docutils/test/test_writers/test_html5_polyglot_parts.py
index fcfa50b6f..f1da90376 100644
--- a/docutils/test/test_writers/test_html5_polyglot_parts.py
+++ b/docutils/test/test_writers/test_html5_polyglot_parts.py
@@ -15,7 +15,7 @@ from __future__ import absolute_import
 
 if __name__ == '__main__':
     import __init__
-from test_transforms import DocutilsTestSupport  # must be imported before docutils
+from test_transforms import DocutilsTestSupport  # before importing docutils!
 from DocutilsTestSupport import (HtmlWriterPublishPartsTestCase,
                                  HtmlPublishPartsTestSuite)
 from docutils import core, __version__
diff --git a/docutils/test/test_writers/test_latex2e.py b/docutils/test/test_writers/test_latex2e.py
index d099ef622..4cd115a5f 100755
--- a/docutils/test/test_writers/test_latex2e.py
+++ b/docutils/test/test_writers/test_latex2e.py
@@ -14,7 +14,7 @@ import string
 
 if __name__ == '__main__':
     import __init__
-from test_transforms import DocutilsTestSupport  # must be imported before docutils
+from test_transforms import DocutilsTestSupport  # before importing docutils!
 
 
 def suite():
diff --git a/docutils/test/test_writers/test_manpage.py b/docutils/test/test_writers/test_manpage.py
index 4d6bdc58f..f0adec7e8 100644
--- a/docutils/test/test_writers/test_manpage.py
+++ b/docutils/test/test_writers/test_manpage.py
@@ -9,7 +9,9 @@ Tests for manpage writer.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_writers import DocutilsTestSupport
 
 
 def suite():
diff --git a/docutils/test/test_writers/test_null.py b/docutils/test/test_writers/test_null.py
index 7d0bcdee4..54ecb3f59 100755
--- a/docutils/test/test_writers/test_null.py
+++ b/docutils/test/test_writers/test_null.py
@@ -9,7 +9,9 @@ Test for Null writer.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_writers import DocutilsTestSupport
 
 
 def suite():
diff --git a/docutils/test/test_writers/test_odt.py b/docutils/test/test_writers/test_odt.py
index fb8fdacdf..05a362b67 100755
--- a/docutils/test/test_writers/test_odt.py
+++ b/docutils/test/test_writers/test_odt.py
@@ -36,7 +36,9 @@ import zipfile
 import xml.etree.ElementTree as etree
 from io import BytesIO
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_writers 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 63149ecf4..d5d36a46d 100755
--- a/docutils/test/test_writers/test_pseudoxml.py
+++ b/docutils/test/test_writers/test_pseudoxml.py
@@ -9,7 +9,9 @@ Test for pseudo-XML writer.
 """
 from __future__ import absolute_import
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_writers import DocutilsTestSupport
 
 
 def suite():
diff --git a/docutils/test/test_writers/test_s5.py b/docutils/test/test_writers/test_s5.py
index 434bab86d..c15535495 100755
--- a/docutils/test/test_writers/test_s5.py
+++ b/docutils/test/test_writers/test_s5.py
@@ -12,7 +12,9 @@ from __future__ import absolute_import
 import os
 import platform
 
-from . import DocutilsTestSupport
+if __name__ == '__main__':
+    import __init__
+from test_writers import DocutilsTestSupport
 
 
 def suite():