removed all but one dependency on test.test_support

19 files changed, 86 insertions, 32 deletions

diff --git a/src/distutils2/tests/__init__.py b/src/distutils2/tests/__init__.py
index 08c508b..f1a5c1a 100644
--- a/src/distutils2/tests/__init__.py
+++ b/src/distutils2/tests/__init__.py
@@ -14,7 +14,11 @@ by import rather than matching pre-defined names.
 
 import os
 import sys
+import warnings
 import unittest2
+import contextlib
+
+from test.test_support import TESTFN    # use TESTFN from stdlib/test_support.
 
 here = os.path.dirname(__file__)
 
@@ -106,6 +110,56 @@ def reap_children():
             except:
                 break
 
+@contextlib.contextmanager
+def captured_output(stream_name):
+    """Run the 'with' statement body using a StringIO object in place of a
+    specific attribute on the sys module.
+    Example use (with 'stream_name=stdout')::
+
+       with captured_stdout() as s:
+           print "hello"
+       assert s.getvalue() == "hello"
+    """
+    import StringIO
+    orig_stdout = getattr(sys, stream_name)
+    setattr(sys, stream_name, StringIO.StringIO())
+    try:
+        yield getattr(sys, stream_name)
+    finally:
+        setattr(sys, stream_name, orig_stdout)
+
+def captured_stdout():
+    return captured_output("stdout")
+
+class WarningsRecorder(object):
+    """Convenience wrapper for the warnings list returned on
+       entry to the warnings.catch_warnings() context manager.
+    """
+    def __init__(self, warnings_list):
+        self.warnings = warnings_list
+
+    def __getattr__(self, attr):
+        if self.warnings:
+            return getattr(self.warnings[-1], attr)
+        elif attr in warnings.WarningMessage._WARNING_DETAILS:
+            return None
+        raise AttributeError("%r has no attribute %r" % (self, attr))
+
+    def reset(self):
+        del self.warnings[:]
+
+@contextlib.contextmanager
+def check_warnings():
+    with warnings.catch_warnings(record=True) as w:
+        yield WarningsRecorder(w)
+
+
+def unload(name):
+    try:
+        del sys.modules[name]
+    except KeyError:
+        pass
+
 
 if __name__ == "__main__":
     unittest2.main(defaultTest="test_suite")
diff --git a/src/distutils2/tests/test_bdist.py b/src/distutils2/tests/test_bdist.py
index a8cc178..79ea0d3 100644
--- a/src/distutils2/tests/test_bdist.py
+++ b/src/distutils2/tests/test_bdist.py
@@ -5,7 +5,7 @@ import os
 import tempfile
 import shutil
 
-from test.test_support import run_unittest
+from distutils2.tests import run_unittest
 
 from distutils2.core import Distribution
 from distutils2.command.bdist import bdist
diff --git a/src/distutils2/tests/test_bdist_dumb.py b/src/distutils2/tests/test_bdist_dumb.py
index f275e5b..826950e 100644
--- a/src/distutils2/tests/test_bdist_dumb.py
+++ b/src/distutils2/tests/test_bdist_dumb.py
@@ -11,7 +11,7 @@ try:
 except ImportError:
     zlib = None
 
-from test.test_support import run_unittest
+from distutils2.tests import run_unittest
 
 from distutils2.core import Distribution
 from distutils2.command.bdist_dumb import bdist_dumb
diff --git a/src/distutils2/tests/test_bdist_msi.py b/src/distutils2/tests/test_bdist_msi.py
index 145947d..59479aa 100644
--- a/src/distutils2/tests/test_bdist_msi.py
+++ b/src/distutils2/tests/test_bdist_msi.py
@@ -2,7 +2,7 @@
 import unittest2
 import sys
 
-from test.test_support import run_unittest
+from distutils2.tests import run_unittest
 
 from distutils2.tests import support
 
diff --git a/src/distutils2/tests/test_bdist_rpm.py b/src/distutils2/tests/test_bdist_rpm.py
index b5f613c..c1db3c5 100644
--- a/src/distutils2/tests/test_bdist_rpm.py
+++ b/src/distutils2/tests/test_bdist_rpm.py
@@ -6,7 +6,7 @@ import os
 import tempfile
 import shutil
 
-from test.test_support import run_unittest
+from distutils2.tests import run_unittest
 
 from distutils2.core import Distribution
 from distutils2.command.bdist_rpm import bdist_rpm
diff --git a/src/distutils2/tests/test_bdist_wininst.py b/src/distutils2/tests/test_bdist_wininst.py
index 181d61b..32db4c0 100644
--- a/src/distutils2/tests/test_bdist_wininst.py
+++ b/src/distutils2/tests/test_bdist_wininst.py
@@ -1,7 +1,7 @@
 """Tests for distutils.command.bdist_wininst."""
 import unittest2
 
-from test.test_support import run_unittest
+from distutils2.tests import run_unittest
 
 from distutils2.command.bdist_wininst import bdist_wininst
 from distutils2.tests import support
diff --git a/src/distutils2/tests/test_build_ext.py b/src/distutils2/tests/test_build_ext.py
index 15a1c72..e20481f 100644
--- a/src/distutils2/tests/test_build_ext.py
+++ b/src/distutils2/tests/test_build_ext.py
@@ -4,8 +4,10 @@ import tempfile
 import shutil
 from StringIO import StringIO
 import warnings
-from test.test_support import check_warnings
-from test.test_support import captured_stdout
+
+import distutils2.tests
+from distutils2.tests import check_warnings
+from distutils2.tests import captured_stdout
 
 from distutils2.core import Extension, Distribution
 from distutils2.command.build_ext import build_ext
@@ -19,7 +21,6 @@ except ImportError:
     from distutils2._backport import sysconfig
 
 import unittest2
-from test import test_support
 
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
@@ -62,7 +63,7 @@ class BuildExtTestCase(support.TempdirManager,
         cmd.build_temp = self.tmp_dir
 
         old_stdout = sys.stdout
-        if not test_support.verbose:
+        if not distutils2.tests.verbose:
             # silence compiler output
             sys.stdout = StringIO()
         try:
@@ -91,7 +92,7 @@ class BuildExtTestCase(support.TempdirManager,
 
     def tearDown(self):
         # Get everything back to normal
-        test_support.unload('xx')
+        distutils2.tests.unload('xx')
         sys.path = self.sys_path[0]
         sys.path[:] = self.sys_path[1]
         if sys.version > "2.6":
@@ -429,11 +430,11 @@ class BuildExtTestCase(support.TempdirManager,
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):
-        if test_support.verbose:
+        if distutils2.tests.verbose:
             print ('test_build_ext: Cannot find source code (test'
                    ' must run in python build dir)')
         return unittest2.TestSuite()
     else: return unittest2.makeSuite(BuildExtTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    distsutils2.tests.run_unittest(test_suite())
diff --git a/src/distutils2/tests/test_ccompiler.py b/src/distutils2/tests/test_ccompiler.py
index 43d231a..7985cde 100644
--- a/src/distutils2/tests/test_ccompiler.py
+++ b/src/distutils2/tests/test_ccompiler.py
@@ -1,7 +1,7 @@
 """Tests for distutils.ccompiler."""
 import os
 import unittest2
-from test.test_support import captured_stdout
+from distutils2.tests import captured_stdout
 
 from distutils2.ccompiler import (gen_lib_options, CCompiler,
                                  get_default_compiler, customize_compiler)
diff --git a/src/distutils2/tests/test_cmd.py b/src/distutils2/tests/test_cmd.py
index 03fffd1..6c85f22 100644
--- a/src/distutils2/tests/test_cmd.py
+++ b/src/distutils2/tests/test_cmd.py
@@ -1,7 +1,7 @@
 """Tests for distutils.cmd."""
 import unittest2
 import os
-from test.test_support import captured_stdout, run_unittest
+from distutils2.tests import captured_stdout, run_unittest
 
 from distutils2.cmd import Command
 from distutils2.dist import Distribution
diff --git a/src/distutils2/tests/test_core.py b/src/distutils2/tests/test_core.py
index a33e203..04aa8af 100644
--- a/src/distutils2/tests/test_core.py
+++ b/src/distutils2/tests/test_core.py
@@ -5,8 +5,7 @@ import distutils2.core
 import os
 import shutil
 import sys
-import test.test_support
-from test.test_support import captured_stdout
+from distutils2.tests import captured_stdout
 import unittest2
 from distutils2.tests import support
 
@@ -45,13 +44,13 @@ class CoreTestCase(support.EnvironGuard, unittest2.TestCase):
         super(CoreTestCase, self).tearDown()
 
     def cleanup_testfn(self):
-        path = test.test_support.TESTFN
+        path = distutils2.tests.TESTFN
         if os.path.isfile(path):
             os.remove(path)
         elif os.path.isdir(path):
             shutil.rmtree(path)
 
-    def write_setup(self, text, path=test.test_support.TESTFN):
+    def write_setup(self, text, path=distutils2.tests.TESTFN):
         open(path, "w").write(text)
         return path
 
@@ -69,8 +68,8 @@ class CoreTestCase(support.EnvironGuard, unittest2.TestCase):
         cwd = os.getcwd()
 
         # Create a directory and write the setup.py file there:
-        os.mkdir(test.test_support.TESTFN)
-        setup_py = os.path.join(test.test_support.TESTFN, "setup.py")
+        os.mkdir(distutils2.tests.TESTFN)
+        setup_py = os.path.join(distutils2.tests.TESTFN, "setup.py")
         distutils2.core.run_setup(
             self.write_setup(setup_prints_cwd, path=setup_py))
 
diff --git a/src/distutils2/tests/test_cygwinccompiler.py b/src/distutils2/tests/test_cygwinccompiler.py
index 5a06c87..36b0592 100644
--- a/src/distutils2/tests/test_cygwinccompiler.py
+++ b/src/distutils2/tests/test_cygwinccompiler.py
@@ -8,8 +8,8 @@ try:
 except ImportError:
     from distutils2._backport import sysconfig
 
-from test.test_support import check_warnings, run_unittest
-from test.test_support import captured_stdout
+from distutils2.tests import check_warnings, run_unittest
+from distutils2.tests import captured_stdout
 
 from distutils2 import cygwinccompiler
 from distutils2.cygwinccompiler import (CygwinCCompiler, check_config_h,
diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py
index b58d773..d42643f 100644
--- a/src/distutils2/tests/test_dist.py
+++ b/src/distutils2/tests/test_dist.py
@@ -11,7 +11,7 @@ import textwrap
 from distutils2.dist import Distribution, fix_help_options, DistributionMetadata
 from distutils2.cmd import Command
 import distutils2.dist
-from test.test_support import TESTFN, captured_stdout
+from distutils2.tests import TESTFN, captured_stdout
 from distutils2.tests import support
 
 class test_dist(Command):
diff --git a/src/distutils2/tests/test_emxccompiler.py b/src/distutils2/tests/test_emxccompiler.py
index 7cf363b..7454fe3 100644
--- a/src/distutils2/tests/test_emxccompiler.py
+++ b/src/distutils2/tests/test_emxccompiler.py
@@ -4,8 +4,8 @@ import sys
 import os
 import warnings
 
-from test.test_support import check_warnings, run_unittest
-from test.test_support import captured_stdout
+from distutils2.tests import check_warnings, run_unittest
+from distutils2.tests import captured_stdout
 
 from distutils2.emxccompiler import get_versions
 from distutils2.util import get_compiler_versions
diff --git a/src/distutils2/tests/test_extension.py b/src/distutils2/tests/test_extension.py
index bd83829..550d45f 100755
--- a/src/distutils2/tests/test_extension.py
+++ b/src/distutils2/tests/test_extension.py
@@ -3,7 +3,7 @@ import unittest2
 import os
 import warnings
 
-from test.test_support import check_warnings
+from distutils2.tests import check_warnings
 from distutils2.extension import Extension
 from distutils2.tests.support import capture_warnings
 
diff --git a/src/distutils2/tests/test_filelist.py b/src/distutils2/tests/test_filelist.py
index 70a519a..d47fc41 100644
--- a/src/distutils2/tests/test_filelist.py
+++ b/src/distutils2/tests/test_filelist.py
@@ -1,7 +1,7 @@
 """Tests for distutils.filelist."""
 from os.path import join
 import unittest2
-from test.test_support import captured_stdout
+from distutils2.tests import captured_stdout
 
 from distutils2.filelist import glob_to_re, FileList
 from distutils2 import debug
diff --git a/src/distutils2/tests/test_install.py b/src/distutils2/tests/test_install.py
index 3390fdb..adc67c8 100644
--- a/src/distutils2/tests/test_install.py
+++ b/src/distutils2/tests/test_install.py
@@ -17,7 +17,7 @@ except ImportError:
                                                 _INSTALL_SCHEMES,
                                                 get_config_var, get_path)
 
-from test.test_support import captured_stdout
+from distutils2.tests import captured_stdout
 
 from distutils2.command.install import install
 from distutils2.command import install as install_module
diff --git a/src/distutils2/tests/test_register.py b/src/distutils2/tests/test_register.py
index 7463587..3e56d05 100644
--- a/src/distutils2/tests/test_register.py
+++ b/src/distutils2/tests/test_register.py
@@ -7,7 +7,7 @@ import getpass
 import urllib2
 import warnings
 
-from test.test_support import check_warnings
+from distutils2.tests import check_warnings
 
 from distutils2.command import register as register_module
 from distutils2.command.register import register
diff --git a/src/distutils2/tests/test_sdist.py b/src/distutils2/tests/test_sdist.py
index 3589285..2be128e 100644
--- a/src/distutils2/tests/test_sdist.py
+++ b/src/distutils2/tests/test_sdist.py
@@ -24,8 +24,8 @@ import sys
 import tempfile
 import warnings
 
-from test.test_support import check_warnings
-from test.test_support import captured_stdout
+from distutils2.tests import check_warnings
+from distutils2.tests import captured_stdout
 
 from distutils2.command.sdist import sdist
 from distutils2.command.sdist import show_formats
diff --git a/src/distutils2/tests/test_spawn.py b/src/distutils2/tests/test_spawn.py
index 4e36416..0688543 100644
--- a/src/distutils2/tests/test_spawn.py
+++ b/src/distutils2/tests/test_spawn.py
@@ -2,7 +2,7 @@
 import unittest2
 import os
 import time
-from test.test_support import captured_stdout
+from distutils2.tests import captured_stdout
 
 from distutils2.spawn import _nt_quote_args
 from distutils2.spawn import spawn, find_executable