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

22 files changed, 21 insertions, 35 deletions

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