corrected order of imports

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

12 files changed, 17 insertions, 13 deletions

diff --git a/test/alltests.py b/test/alltests.py
index c6a44e003..edf1ac7ad 100755
--- a/test/alltests.py
+++ b/test/alltests.py
@@ -22,6 +22,7 @@ start = time.time()
 import sys
 import os
 from types import UnicodeType
+import DocutilsTestSupport              # must be imported before docutils
 import docutils
 
 
diff --git a/test/test_dependencies.py b/test/test_dependencies.py
index c9f00518d..46e8ff846 100755
--- a/test/test_dependencies.py
+++ b/test/test_dependencies.py
@@ -13,9 +13,9 @@ Test module for the --record-dependencies option.
 import os.path
 import unittest
 import sys
+import DocutilsTestSupport              # must be imported before docutils
 import docutils.core
 import docutils.utils
-import DocutilsTestSupport
 
 
 class RecordDependenciesTests(unittest.TestCase):
diff --git a/test/test_functional.py b/test/test_functional.py
index e52d41422..1cebc2462 100755
--- a/test/test_functional.py
+++ b/test/test_functional.py
@@ -17,9 +17,9 @@ import os
 import os.path
 import unittest
 import difflib
+import DocutilsTestSupport              # must be imported before docutils
 import docutils
 import docutils.core
-import DocutilsTestSupport
 
 
 datadir = 'functional'
diff --git a/test/test_io.py b/test/test_io.py
index e65b05c6c..b82911e44 100755
--- a/test/test_io.py
+++ b/test/test_io.py
@@ -11,6 +11,7 @@ Test module for io.py.
 """
 
 import unittest
+import DocutilsTestSupport              # must be imported before docutils
 from docutils import io
 
 
diff --git a/test/test_language.py b/test/test_language.py
index 79509b46a..0571275e7 100755
--- a/test/test_language.py
+++ b/test/test_language.py
@@ -17,20 +17,21 @@ import sys
 import os
 import re
 from types import UnicodeType
+import DocutilsTestSupport              # must be imported before docutils
 import docutils.languages
 import docutils.parsers.rst.languages
 from docutils.parsers.rst import states, directives, roles
-from DocutilsTestSupport import CustomTestSuite, CustomTestCase
+
 
 reference_language = 'en'
 
 
-class LanguageTestSuite(CustomTestSuite):
+class LanguageTestSuite(DocutilsTestSupport.CustomTestSuite):
 
     language_module_pattern = re.compile('^([a-z]{2,3}(_[a-z]{2,8})*)\.py$')
 
     def __init__(self, languages=None):
-        CustomTestSuite.__init__(self)
+        DocutilsTestSupport.CustomTestSuite.__init__(self)
         if languages:
             self.languages = languages
         else:
@@ -56,7 +57,7 @@ class LanguageTestSuite(CustomTestSuite):
                                  id=language+'.py', language=language)
 
 
-class LanguageTestCase(CustomTestCase):
+class LanguageTestCase(DocutilsTestSupport.CustomTestCase):
 
     test_methods = ['test_labels', 'test_bibliographic_fields',
                     'test_directives', 'test_roles']
@@ -66,7 +67,7 @@ class LanguageTestCase(CustomTestCase):
         self.ref = docutils.languages.get_language(reference_language)
         self.language = kwargs['language']
         del kwargs['language']          # only wanted here
-        CustomTestCase.__init__(self, *args, **kwargs)
+        DocutilsTestSupport.CustomTestCase.__init__(self, *args, **kwargs)
 
     def _xor(self, ref_dict, l_dict):
         """
diff --git a/test/test_nodes.py b/test/test_nodes.py
index 4471b3a15..5467c5490 100755
--- a/test/test_nodes.py
+++ b/test/test_nodes.py
@@ -12,6 +12,7 @@ Test module for nodes.py.
 
 import unittest
 from types import ClassType
+import DocutilsTestSupport              # must be imported before docutils
 from DocutilsTestSupport import nodes, utils
 
 debug = 0
diff --git a/test/test_publisher.py b/test/test_publisher.py
index 545822bc6..708c3ef87 100755
--- a/test/test_publisher.py
+++ b/test/test_publisher.py
@@ -12,12 +12,10 @@ Test the `Publisher` facade and the ``publish_*`` convenience functions.
 
 import pickle
 from types import StringType, DictType
-
+import DocutilsTestSupport              # must be imported before docutils
 import docutils
 from docutils import core, nodes, io
 
-import DocutilsTestSupport
-
 
 test_document = """\
 Test Document
diff --git a/test/test_settings.py b/test/test_settings.py
index 4226af580..157cb71e1 100755
--- a/test/test_settings.py
+++ b/test/test_settings.py
@@ -17,6 +17,7 @@ import pprint
 import warnings
 import unittest
 from types import StringType
+import DocutilsTestSupport              # must be imported before docutils
 from docutils import frontend, utils
 from docutils.writers import html4css1, pep_html
 from docutils.parsers import rst
diff --git a/test/test_transforms/test___init__.py b/test/test_transforms/test___init__.py
index a126d8854..30e60afd3 100755
--- a/test/test_transforms/test___init__.py
+++ b/test/test_transforms/test___init__.py
@@ -10,6 +10,7 @@
 Test module for transforms/__init__.py.
 """
 
+from __init__ import DocutilsTestSupport # must be imported before docutils
 from docutils import transforms, utils
 import unittest
 
diff --git a/test/test_transforms/test_expose_internals.py b/test/test_transforms/test_expose_internals.py
index db19d2a0a..69193246a 100755
--- a/test/test_transforms/test_expose_internals.py
+++ b/test/test_transforms/test_expose_internals.py
@@ -11,8 +11,8 @@ Test module for universal.ExposeInternals transform.
 """
 
 
+from __init__ import DocutilsTestSupport # must be imported before docutils
 from docutils.transforms.universal import ExposeInternals
-from __init__ import DocutilsTestSupport
 from docutils.parsers.rst import Parser
 
 def suite():
diff --git a/test/test_transforms/test_transitions.py b/test/test_transforms/test_transitions.py
index e450ddff7..098c8bba3 100755
--- a/test/test_transforms/test_transitions.py
+++ b/test/test_transforms/test_transitions.py
@@ -10,8 +10,8 @@
 Test module for misc.Transitions transform.
 """
 
+from __init__ import DocutilsTestSupport # must be imported before docutils
 from docutils.transforms.misc import Transitions
-from __init__ import DocutilsTestSupport
 from docutils.parsers.rst import Parser
 
 def suite():
diff --git a/test/test_transforms/test_writer_aux.py b/test/test_transforms/test_writer_aux.py
index 34b723241..5ec040a69 100755
--- a/test/test_transforms/test_writer_aux.py
+++ b/test/test_transforms/test_writer_aux.py
@@ -10,8 +10,8 @@
 Test module for writer_aux transforms.
 """
 
+from __init__ import DocutilsTestSupport # must be imported before docutils
 from docutils.transforms import writer_aux
-from __init__ import DocutilsTestSupport
 from docutils.parsers.rst import Parser
 
 def suite():