enabled running standalone

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

34 files changed, 35 insertions, 40 deletions

diff --git a/docutils/test/test_parsers/test_rst/test_TableParser.py b/docutils/test/test_parsers/test_rst/test_TableParser.py
index ed6083d50..d79c2c58d 100755
--- a/docutils/test/test_parsers/test_rst/test_TableParser.py
+++ b/docutils/test/test_parsers/test_rst/test_TableParser.py
@@ -10,7 +10,7 @@
 Tests for states.py.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.TableParserTestSuite()
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 2159a2cdd..9ef810972 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.
 """
 
-import DocutilsTestSupport
+from __init__ 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 df8a14381..61049ae8a 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_citations.py b/docutils/test/test_parsers/test_rst/test_citations.py
index 0a6c7b1be..803b1f2c3 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.
 """
 
-import DocutilsTestSupport
+from __init__ 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 becb8f392..11cea2a1e 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.
 """
 
-import DocutilsTestSupport
+from __init__ 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 82ee4f819..c24e582ea 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.
 """
 
-import DocutilsTestSupport
+from __init__ 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 f231967e0..87f82d527 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.
 """
 
-import DocutilsTestSupport
+from __init__ 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 0f394103d..4743798dc 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 components.py contents directives.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 290584a21..9e488ceca 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 c97dec1ea..e49a2c3aa 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 20b5a10f1..8cdc93bd6 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.py meta directives.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 20c1541a8..4c7feb970 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 67935d652..46af7dcfd 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 869b6f187..70f182fd0 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 5762b3253..0eb599e44 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 467609e98..254126af4 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_footnotes.py b/docutils/test/test_parsers/test_rst/test_footnotes.py
index 2301bbf47..60511b1a6 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_functions.py b/docutils/test/test_parsers/test_rst/test_functions.py
index d1d9786e3..2cf7c6a7e 100755
--- a/docutils/test/test_parsers/test_rst/test_functions.py
+++ b/docutils/test/test_parsers/test_rst/test_functions.py
@@ -11,7 +11,8 @@ Tests for states.py.
 """
 
 import unittest
-from DocutilsTestSupport import states
+from __init__ import DocutilsTestSupport
+states = DocutilsTestSupport.states
 
 
 class FuctionTests(unittest.TestCase):
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 f367c1b64..4a1c3e4c6 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 @@
 Tests for states.py.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 3d694ba74..651733b09 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 125a49bcd..bbabe51a6 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_outdenting.py b/docutils/test/test_parsers/test_rst/test_outdenting.py
index 8e9afc8c6..314c50837 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_paragraphs.py b/docutils/test/test_parsers/test_rst/test_paragraphs.py
index 83dc61845..d1f3a324a 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
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 53a15d10c..54c556623 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,7 @@
 Tests for states.py.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_substitutions.py b/docutils/test/test_parsers/test_rst/test_substitutions.py
index 6fa77687d..3f1c34c68 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_tables.py b/docutils/test/test_parsers/test_rst/test_tables.py
index 9def8df40..b6f1be993 100755
--- a/docutils/test/test_parsers/test_rst/test_tables.py
+++ b/docutils/test/test_parsers/test_rst/test_tables.py
@@ -10,7 +10,7 @@
 Tests for states.py.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_targets.py b/docutils/test/test_parsers/test_rst/test_targets.py
index 598634434..1379db420 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_parsers/test_rst/test_transitions.py b/docutils/test/test_parsers/test_rst/test_transitions.py
index b78f794ee..acb9b0ab2 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.
 """
 
-import DocutilsTestSupport
+from __init__ import DocutilsTestSupport
 
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
diff --git a/docutils/test/test_transforms/test_docinfo.py b/docutils/test/test_transforms/test_docinfo.py
index 404a0b9a7..d5dd4b873 100755
--- a/docutils/test/test_transforms/test_docinfo.py
+++ b/docutils/test/test_transforms/test_docinfo.py
@@ -10,8 +10,7 @@
 Tests for docutils.transforms.frontmatter.DocInfo.
 """
 
-import DocutilsTestSupport
-import UnitTestFolder
+from __init__ 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 4ba0d69c5..842906945 100755
--- a/docutils/test/test_transforms/test_doctitle.py
+++ b/docutils/test/test_transforms/test_doctitle.py
@@ -10,8 +10,7 @@
 Tests for docutils.transforms.frontmatter.DocTitle.
 """
 
-import DocutilsTestSupport
-import UnitTestFolder
+from __init__ import DocutilsTestSupport
 from docutils.transforms.frontmatter import DocTitle
 from docutils.parsers.rst import Parser
 
diff --git a/docutils/test/test_transforms/test_final_checks.py b/docutils/test/test_transforms/test_final_checks.py
index e65f16475..c74919c56 100755
--- a/docutils/test/test_transforms/test_final_checks.py
+++ b/docutils/test/test_transforms/test_final_checks.py
@@ -10,8 +10,7 @@
 Tests for docutils.transforms.universal.FinalChecks.
 """
 
-import DocutilsTestSupport
-import UnitTestFolder
+from __init__ import DocutilsTestSupport
 from docutils.transforms.universal import FinalChecks
 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 4b015492a..811b2dcfe 100755
--- a/docutils/test/test_transforms/test_hyperlinks.py
+++ b/docutils/test/test_transforms/test_hyperlinks.py
@@ -10,8 +10,7 @@
 Tests for docutils.transforms.references.Hyperlinks.
 """
 
-import DocutilsTestSupport
-import UnitTestFolder
+from __init__ import DocutilsTestSupport
 from docutils.transforms.references import Hyperlinks
 from docutils.parsers.rst import Parser
 
diff --git a/docutils/test/test_transforms/test_messages.py b/docutils/test/test_transforms/test_messages.py
index d2134d661..6751c3ecd 100755
--- a/docutils/test/test_transforms/test_messages.py
+++ b/docutils/test/test_transforms/test_messages.py
@@ -10,8 +10,7 @@
 Tests for docutils.transforms.universal.Messages.
 """
 
-import DocutilsTestSupport
-import UnitTestFolder
+from __init__ 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_substitutions.py b/docutils/test/test_transforms/test_substitutions.py
index 693c734a2..c02dd0218 100755
--- a/docutils/test/test_transforms/test_substitutions.py
+++ b/docutils/test/test_transforms/test_substitutions.py
@@ -10,8 +10,7 @@
 Tests for docutils.transforms.references.Substitutions.
 """
 
-import DocutilsTestSupport
-import UnitTestFolder
+from __init__ import DocutilsTestSupport
 from docutils.transforms.references import Substitutions
 from docutils.parsers.rst import Parser