[Python-checkins] distutils2: refactored unittest import logic to improve accuracy of the coverage measurement

tarek.ziade python-checkins at python.org
Sat Oct 2 00:52:19 CEST 2010 

tarek.ziade pushed 2916c65826c3 to distutils2:

http://hg.python.org/distutils2/rev/2916c65826c3
changeset:   713:2916c65826c3
user:        Yannick Gingras <ygingras at ygingras.net>
date:        Thu Sep 30 04:47:45 2010 -0400
summary:     refactored unittest import logic to improve accuracy of the coverage measurement
files:       distutils2/tests/__init__.py, distutils2/tests/pypi_server.py, distutils2/tests/support.py, distutils2/tests/test_Mixin2to3.py, distutils2/tests/test_bdist.py, distutils2/tests/test_bdist_dumb.py, distutils2/tests/test_bdist_msi.py, distutils2/tests/test_bdist_wininst.py, distutils2/tests/test_build.py, distutils2/tests/test_build_clib.py, distutils2/tests/test_build_ext.py, distutils2/tests/test_build_py.py, distutils2/tests/test_build_scripts.py, distutils2/tests/test_ccompiler.py, distutils2/tests/test_check.py, distutils2/tests/test_clean.py, distutils2/tests/test_cmd.py, distutils2/tests/test_config.py, distutils2/tests/test_config_cmd.py, distutils2/tests/test_core.py, distutils2/tests/test_cygwinccompiler.py, distutils2/tests/test_depgraph.py, distutils2/tests/test_dist.py, distutils2/tests/test_emxccompiler.py, distutils2/tests/test_extension.py, distutils2/tests/test_index_dist.py, distutils2/tests/test_index_simple.py, distutils2/tests/test_index_xmlrpc.py, distutils2/tests/test_install.py, distutils2/tests/test_install_data.py, distutils2/tests/test_install_distinfo.py, distutils2/tests/test_install_headers.py, distutils2/tests/test_install_lib.py, distutils2/tests/test_install_scripts.py, distutils2/tests/test_install_tools.py, distutils2/tests/test_manifest.py, distutils2/tests/test_metadata.py, distutils2/tests/test_msvc9compiler.py, distutils2/tests/test_pypi_server.py, distutils2/tests/test_pypi_versions.py, distutils2/tests/test_register.py, distutils2/tests/test_sdist.py, distutils2/tests/test_test.py, distutils2/tests/test_unixccompiler.py, distutils2/tests/test_upload.py, distutils2/tests/test_upload_docs.py, distutils2/tests/test_util.py, distutils2/tests/test_version.py, runtests-cov.py

diff --git a/distutils2/tests/__init__.py b/distutils2/tests/__init__.py
--- a/distutils2/tests/__init__.py
+++ b/distutils2/tests/__init__.py
@@ -10,15 +10,22 @@
 distutils2.command.tests package, since command identification is done
 by import rather than matching pre-defined names.
 
-Utility code is included in distutils2.tests.support.  Always import
-unittest from that module, it will be the right version (standard
-library unittest for 2.7 and higher, third-party unittest2 release for
-older versions).
+Always import unittest from this module, it will be the right version
+(standard library unittest for 3.2 and higher, third-party unittest2
+release for older versions).
+
+Utility code is included in distutils2.tests.support.  
 """
 
 import os
 import sys
-from distutils2.tests.support import unittest
+
+if sys.version_info >= (3, 2):
+    # improved unittest package from 3.2's standard library
+    import unittest
+else:
+    # external release of same package for older versions
+    import unittest2 as unittest
 
 from test.test_support import TESTFN    # use TESTFN from stdlib/test_support.
 
diff --git a/distutils2/tests/pypi_server.py b/distutils2/tests/pypi_server.py
--- a/distutils2/tests/pypi_server.py
+++ b/distutils2/tests/pypi_server.py
@@ -40,7 +40,7 @@
 from SimpleHTTPServer import SimpleHTTPRequestHandler
 from SimpleXMLRPCServer import SimpleXMLRPCServer
 
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 
 PYPI_DEFAULT_STATIC_PATH = os.path.dirname(os.path.abspath(__file__)) + "/pypiserver"
 
diff --git a/distutils2/tests/support.py b/distutils2/tests/support.py
--- a/distutils2/tests/support.py
+++ b/distutils2/tests/support.py
@@ -1,14 +1,10 @@
 """Support code for distutils2 test cases.
 
-Always import unittest from this module, it will be the right version
-(standard library unittest for 3.2 and higher, third-party unittest2
-release for older versions).
-
 Four helper classes are provided: LoggingCatcher, TempdirManager,
 EnvironGuard and WarningsCatcher. They are written to be used as mixins,
 e.g. ::
 
-    from distutils2.tests.support import unittest
+    from distutils2.tests import unittest
     from distutils2.tests.support import LoggingCatcher
 
     class SomeTestCase(LoggingCatcher, unittest.TestCase):
@@ -37,13 +33,7 @@
 from distutils2 import log
 from distutils2.dist import Distribution
 from distutils2.log import DEBUG, INFO, WARN, ERROR, FATAL
-
-if sys.version_info >= (3, 2):
-    # improved unittest package from 3.2's standard library
-    import unittest
-else:
-    # external release of same package for older versions
-    import unittest2 as unittest
+from distutils2.tests import unittest
 
 __all__ = ['LoggingCatcher', 'WarningsCatcher', 'TempdirManager',
            'EnvironGuard', 'DummyCommand', 'unittest']
diff --git a/distutils2/tests/test_Mixin2to3.py b/distutils2/tests/test_Mixin2to3.py
--- a/distutils2/tests/test_Mixin2to3.py
+++ b/distutils2/tests/test_Mixin2to3.py
@@ -3,8 +3,7 @@
 import logging
 
 import distutils2
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 from distutils2.compat import Mixin2to3
 
 
diff --git a/distutils2/tests/test_bdist.py b/distutils2/tests/test_bdist.py
--- a/distutils2/tests/test_bdist.py
+++ b/distutils2/tests/test_bdist.py
@@ -6,8 +6,7 @@
 
 from distutils2.core import Distribution
 from distutils2.command.bdist import bdist
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 from distutils2.util import find_executable
 from distutils2.errors import DistutilsExecError
 
diff --git a/distutils2/tests/test_bdist_dumb.py b/distutils2/tests/test_bdist_dumb.py
--- a/distutils2/tests/test_bdist_dumb.py
+++ b/distutils2/tests/test_bdist_dumb.py
@@ -10,8 +10,7 @@
 except ImportError:
     zlib = None
 
-from distutils2.tests import run_unittest
-from distutils2.tests.support import unittest
+from distutils2.tests import run_unittest, unittest
 
 from distutils2.core import Distribution
 from distutils2.command.bdist_dumb import bdist_dumb
diff --git a/distutils2/tests/test_bdist_msi.py b/distutils2/tests/test_bdist_msi.py
--- a/distutils2/tests/test_bdist_msi.py
+++ b/distutils2/tests/test_bdist_msi.py
@@ -3,8 +3,7 @@
 
 from distutils2.tests import run_unittest
 
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 class BDistMSITestCase(support.TempdirManager,
                        support.LoggingCatcher,
diff --git a/distutils2/tests/test_bdist_wininst.py b/distutils2/tests/test_bdist_wininst.py
--- a/distutils2/tests/test_bdist_wininst.py
+++ b/distutils2/tests/test_bdist_wininst.py
@@ -1,10 +1,7 @@
 """Tests for distutils.command.bdist_wininst."""
 
-from distutils2.tests import run_unittest
-
+from distutils2.tests import unittest, support, run_unittest
 from distutils2.command.bdist_wininst import bdist_wininst
-from distutils2.tests import support
-from distutils2.tests.support import unittest
 
 class BuildWinInstTestCase(support.TempdirManager,
                            support.LoggingCatcher,
diff --git a/distutils2/tests/test_build.py b/distutils2/tests/test_build.py
--- a/distutils2/tests/test_build.py
+++ b/distutils2/tests/test_build.py
@@ -3,8 +3,7 @@
 import sys
 
 from distutils2.command.build import build
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 try:
     from sysconfig import get_platform
 except ImportError:
diff --git a/distutils2/tests/test_build_clib.py b/distutils2/tests/test_build_clib.py
--- a/distutils2/tests/test_build_clib.py
+++ b/distutils2/tests/test_build_clib.py
@@ -4,9 +4,8 @@
 
 from distutils2.command.build_clib import build_clib
 from distutils2.errors import DistutilsSetupError
-from distutils2.tests import support
+from distutils2.tests import unittest, support
 from distutils2.util import find_executable
-from distutils2.tests.support import unittest
 
 class BuildCLibTestCase(support.TempdirManager,
                         support.LoggingCatcher,
diff --git a/distutils2/tests/test_build_ext.py b/distutils2/tests/test_build_ext.py
--- a/distutils2/tests/test_build_ext.py
+++ b/distutils2/tests/test_build_ext.py
@@ -4,7 +4,7 @@
 from StringIO import StringIO
 
 import distutils2.tests
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 from distutils2.core import Extension, Distribution
 from distutils2.command.build_ext import build_ext
 from distutils2.tests import support
diff --git a/distutils2/tests/test_build_py.py b/distutils2/tests/test_build_py.py
--- a/distutils2/tests/test_build_py.py
+++ b/distutils2/tests/test_build_py.py
@@ -8,8 +8,7 @@
 from distutils2.core import Distribution
 from distutils2.errors import DistutilsFileError
 
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 
 class BuildPyTestCase(support.TempdirManager,
diff --git a/distutils2/tests/test_build_scripts.py b/distutils2/tests/test_build_scripts.py
--- a/distutils2/tests/test_build_scripts.py
+++ b/distutils2/tests/test_build_scripts.py
@@ -9,8 +9,7 @@
 except ImportError:
     from distutils2._backport import sysconfig
 
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 
 class BuildScriptsTestCase(support.TempdirManager,
diff --git a/distutils2/tests/test_ccompiler.py b/distutils2/tests/test_ccompiler.py
--- a/distutils2/tests/test_ccompiler.py
+++ b/distutils2/tests/test_ccompiler.py
@@ -4,8 +4,7 @@
 
 from distutils2.compiler.ccompiler import (gen_lib_options, CCompiler,
                                  get_default_compiler, customize_compiler)
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 class FakeCompiler(object):
     def library_dir_option(self, dir):
diff --git a/distutils2/tests/test_check.py b/distutils2/tests/test_check.py
--- a/distutils2/tests/test_check.py
+++ b/distutils2/tests/test_check.py
@@ -2,8 +2,7 @@
 
 from distutils2.command.check import check
 from distutils2.metadata import _HAS_DOCUTILS
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 from distutils2.errors import DistutilsSetupError
 
 class CheckTestCase(support.LoggingCatcher,
diff --git a/distutils2/tests/test_clean.py b/distutils2/tests/test_clean.py
--- a/distutils2/tests/test_clean.py
+++ b/distutils2/tests/test_clean.py
@@ -1,11 +1,8 @@
 """Tests for distutils.command.clean."""
-import sys
 import os
-import getpass
 
 from distutils2.command.clean import clean
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 class cleanTestCase(support.TempdirManager,
                     support.LoggingCatcher,
diff --git a/distutils2/tests/test_cmd.py b/distutils2/tests/test_cmd.py
--- a/distutils2/tests/test_cmd.py
+++ b/distutils2/tests/test_cmd.py
@@ -5,7 +5,7 @@
 from distutils2.command.cmd import Command
 from distutils2.dist import Distribution
 from distutils2.errors import DistutilsOptionError
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 
 class MyCmd(Command):
     def initialize_options(self):
diff --git a/distutils2/tests/test_config.py b/distutils2/tests/test_config.py
--- a/distutils2/tests/test_config.py
+++ b/distutils2/tests/test_config.py
@@ -3,8 +3,7 @@
 import os
 import copy
 
-from distutils2.tests import support, run_unittest
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support, run_unittest
 
 
 SETUP_CFG = """
diff --git a/distutils2/tests/test_config_cmd.py b/distutils2/tests/test_config_cmd.py
--- a/distutils2/tests/test_config_cmd.py
+++ b/distutils2/tests/test_config_cmd.py
@@ -3,8 +3,7 @@
 import sys
 
 from distutils2.command.config import dump_file, config
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 from distutils2 import log
 
 class ConfigTestCase(support.LoggingCatcher,
diff --git a/distutils2/tests/test_core.py b/distutils2/tests/test_core.py
--- a/distutils2/tests/test_core.py
+++ b/distutils2/tests/test_core.py
@@ -6,8 +6,7 @@
 import shutil
 import sys
 from distutils2.tests import captured_stdout
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 # setup script that uses __file__
 setup_using___file__ = """\
diff --git a/distutils2/tests/test_cygwinccompiler.py b/distutils2/tests/test_cygwinccompiler.py
--- a/distutils2/tests/test_cygwinccompiler.py
+++ b/distutils2/tests/test_cygwinccompiler.py
@@ -15,8 +15,7 @@
                                        CONFIG_H_UNCERTAIN, get_versions,
                                        get_msvcr, RE_VERSION)
 from distutils2.util import get_compiler_versions
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 class CygwinCCompilerTestCase(support.TempdirManager,
                               unittest.TestCase):
diff --git a/distutils2/tests/test_depgraph.py b/distutils2/tests/test_depgraph.py
--- a/distutils2/tests/test_depgraph.py
+++ b/distutils2/tests/test_depgraph.py
@@ -1,7 +1,6 @@
 """Tests for distutils.depgraph """
 
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 from distutils2 import depgraph
 from distutils2._backport import pkgutil
 
diff --git a/distutils2/tests/test_dist.py b/distutils2/tests/test_dist.py
--- a/distutils2/tests/test_dist.py
+++ b/distutils2/tests/test_dist.py
@@ -11,8 +11,8 @@
 from distutils2.command.cmd import Command
 from distutils2.errors import DistutilsModuleError, DistutilsOptionError
 from distutils2.tests import TESTFN, captured_stdout
-from distutils2.tests import support
-from distutils2.tests.support import unittest, create_distribution
+from distutils2.tests import support, unittest
+from distutils2.tests.support import create_distribution
 
 
 class test_dist(Command):
diff --git a/distutils2/tests/test_emxccompiler.py b/distutils2/tests/test_emxccompiler.py
--- a/distutils2/tests/test_emxccompiler.py
+++ b/distutils2/tests/test_emxccompiler.py
@@ -7,8 +7,7 @@
 
 from distutils2.compiler.emxccompiler import get_versions
 from distutils2.util import get_compiler_versions
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 class EmxCCompilerTestCase(support.TempdirManager,
                            unittest.TestCase):
diff --git a/distutils2/tests/test_extension.py b/distutils2/tests/test_extension.py
--- a/distutils2/tests/test_extension.py
+++ b/distutils2/tests/test_extension.py
@@ -2,7 +2,7 @@
 import os
 
 from distutils2.extension import Extension
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 
 class ExtensionTestCase(unittest.TestCase):
 
diff --git a/distutils2/tests/test_index_dist.py b/distutils2/tests/test_index_dist.py
--- a/distutils2/tests/test_index_dist.py
+++ b/distutils2/tests/test_index_dist.py
@@ -4,7 +4,8 @@
 
 from distutils2.tests.pypi_server import use_pypi_server
 from distutils2.tests import run_unittest
-from distutils2.tests.support import unittest, TempdirManager
+from distutils2.tests import unittest
+from distutils2.tests.support import TempdirManager
 from distutils2.version import VersionPredicate
 from distutils2.index.errors import HashDoesNotMatch, UnsupportedHashName
 from distutils2.index.dist import (ReleaseInfo, ReleasesList, DistInfo,
diff --git a/distutils2/tests/test_index_simple.py b/distutils2/tests/test_index_simple.py
--- a/distutils2/tests/test_index_simple.py
+++ b/distutils2/tests/test_index_simple.py
@@ -6,8 +6,7 @@
 import urllib2
 
 from distutils2.index.simple import Crawler
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 from distutils2.tests.pypi_server import (use_pypi_server, PyPIServer,
                                           PYPI_DEFAULT_STATIC_PATH)
 
diff --git a/distutils2/tests/test_index_xmlrpc.py b/distutils2/tests/test_index_xmlrpc.py
--- a/distutils2/tests/test_index_xmlrpc.py
+++ b/distutils2/tests/test_index_xmlrpc.py
@@ -1,8 +1,7 @@
 """Tests for the distutils2.index.xmlrpc module."""
 
 from distutils2.tests.pypi_server import use_xmlrpc_server
-from distutils2.tests import run_unittest
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, run_unittest
 from distutils2.index.xmlrpc import Client, InvalidSearchField, ProjectNotFound
 
 
diff --git a/distutils2/tests/test_install.py b/distutils2/tests/test_install.py
--- a/distutils2/tests/test_install.py
+++ b/distutils2/tests/test_install.py
@@ -17,8 +17,7 @@
 from distutils2.core import Distribution
 from distutils2.errors import DistutilsOptionError
 
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 class InstallTestCase(support.TempdirManager,
                       support.EnvironGuard,
diff --git a/distutils2/tests/test_install_data.py b/distutils2/tests/test_install_data.py
--- a/distutils2/tests/test_install_data.py
+++ b/distutils2/tests/test_install_data.py
@@ -4,8 +4,7 @@
 import getpass
 
 from distutils2.command.install_data import install_data
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 class InstallDataTestCase(support.TempdirManager,
                           support.LoggingCatcher,
diff --git a/distutils2/tests/test_install_distinfo.py b/distutils2/tests/test_install_distinfo.py
--- a/distutils2/tests/test_install_distinfo.py
+++ b/distutils2/tests/test_install_distinfo.py
@@ -7,8 +7,7 @@
 from distutils2.command.install_distinfo import install_distinfo
 from distutils2.core import Command
 from distutils2.metadata import DistributionMetadata
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 try:
     import hashlib
diff --git a/distutils2/tests/test_install_headers.py b/distutils2/tests/test_install_headers.py
--- a/distutils2/tests/test_install_headers.py
+++ b/distutils2/tests/test_install_headers.py
@@ -4,8 +4,7 @@
 import getpass
 
 from distutils2.command.install_headers import install_headers
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 class InstallHeadersTestCase(support.TempdirManager,
                              support.LoggingCatcher,
diff --git a/distutils2/tests/test_install_lib.py b/distutils2/tests/test_install_lib.py
--- a/distutils2/tests/test_install_lib.py
+++ b/distutils2/tests/test_install_lib.py
@@ -4,9 +4,8 @@
 
 from distutils2.command.install_lib import install_lib
 from distutils2.extension import Extension
-from distutils2.tests import support
+from distutils2.tests import unittest, support
 from distutils2.errors import DistutilsOptionError
-from distutils2.tests.support import unittest
 
 try:
     no_bytecode = sys.dont_write_bytecode
diff --git a/distutils2/tests/test_install_scripts.py b/distutils2/tests/test_install_scripts.py
--- a/distutils2/tests/test_install_scripts.py
+++ b/distutils2/tests/test_install_scripts.py
@@ -5,8 +5,7 @@
 from distutils2.command.install_scripts import install_scripts
 from distutils2.core import Distribution
 
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 
 class InstallScriptsTestCase(support.TempdirManager,
diff --git a/distutils2/tests/test_install_tools.py b/distutils2/tests/test_install_tools.py
--- a/distutils2/tests/test_install_tools.py
+++ b/distutils2/tests/test_install_tools.py
@@ -1,8 +1,7 @@
 """Tests for the distutils2.index.xmlrpc module."""
 
 from distutils2.tests.pypi_server import use_xmlrpc_server
-from distutils2.tests import run_unittest
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, run_unittest
 from distutils2.index.xmlrpc import Client
 from distutils2.install_tools import (get_infos,
                                           InstallationException)
diff --git a/distutils2/tests/test_manifest.py b/distutils2/tests/test_manifest.py
--- a/distutils2/tests/test_manifest.py
+++ b/distutils2/tests/test_manifest.py
@@ -4,8 +4,7 @@
 import logging
 
 from distutils2.tests import run_unittest
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 from distutils2.manifest import Manifest
 
 _MANIFEST = """\
diff --git a/distutils2/tests/test_metadata.py b/distutils2/tests/test_metadata.py
--- a/distutils2/tests/test_metadata.py
+++ b/distutils2/tests/test_metadata.py
@@ -6,8 +6,8 @@
 
 from distutils2.metadata import (DistributionMetadata, _interpret,
                                  PKG_INFO_PREFERRED_VERSION)
-from distutils2.tests import run_unittest
-from distutils2.tests.support import unittest, LoggingCatcher
+from distutils2.tests import run_unittest, unittest
+from distutils2.tests.support import LoggingCatcher
 from distutils2.errors import (MetadataConflictError,
                                MetadataUnrecognizedVersionError)
 
diff --git a/distutils2/tests/test_msvc9compiler.py b/distutils2/tests/test_msvc9compiler.py
--- a/distutils2/tests/test_msvc9compiler.py
+++ b/distutils2/tests/test_msvc9compiler.py
@@ -3,8 +3,7 @@
 import os
 
 from distutils2.errors import DistutilsPlatformError
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 _MANIFEST = """\
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/distutils2/tests/test_pypi_server.py b/distutils2/tests/test_pypi_server.py
--- a/distutils2/tests/test_pypi_server.py
+++ b/distutils2/tests/test_pypi_server.py
@@ -4,7 +4,7 @@
 import os.path
 
 from distutils2.tests.pypi_server import PyPIServer, PYPI_DEFAULT_STATIC_PATH
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 
 
 class PyPIServerTest(unittest.TestCase):
diff --git a/distutils2/tests/test_pypi_versions.py b/distutils2/tests/test_pypi_versions.py
--- a/distutils2/tests/test_pypi_versions.py
+++ b/distutils2/tests/test_pypi_versions.py
@@ -18,8 +18,7 @@
    import pickle
 
 from distutils2.version import suggest_normalized_version
-from distutils2.tests import run_unittest
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, run_unittest
 
 def test_pypi():
     # FIXME need a better way to do that
diff --git a/distutils2/tests/test_register.py b/distutils2/tests/test_register.py
--- a/distutils2/tests/test_register.py
+++ b/distutils2/tests/test_register.py
@@ -16,9 +16,7 @@
 from distutils2.core import Distribution
 from distutils2.errors import DistutilsSetupError
 
-from distutils2.tests import support
-from distutils2.tests.support import unittest
-
+from distutils2.tests import unittest, support
 
 PYPIRC_NOPASSWORD = """\
 [distutils]
diff --git a/distutils2/tests/test_sdist.py b/distutils2/tests/test_sdist.py
--- a/distutils2/tests/test_sdist.py
+++ b/distutils2/tests/test_sdist.py
@@ -26,7 +26,7 @@
 from distutils2.command.sdist import sdist
 from distutils2.command.sdist import show_formats
 from distutils2.core import Distribution
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 from distutils2.errors import DistutilsExecError, DistutilsOptionError
 from distutils2.util import find_executable
 from distutils2.tests import support
diff --git a/distutils2/tests/test_test.py b/distutils2/tests/test_test.py
--- a/distutils2/tests/test_test.py
+++ b/distutils2/tests/test_test.py
@@ -9,7 +9,8 @@
 from operator import getitem, setitem, delitem
 from StringIO import StringIO
 from distutils2.core import Command
-from distutils2.tests.support import unittest, TempdirManager
+from distutils2.tests import unittest
+from distutils2.tests.support import TempdirManager
 from distutils2.command.test import test
 from distutils2.dist import Distribution
 from distutils2._backport import pkgutil
diff --git a/distutils2/tests/test_unixccompiler.py b/distutils2/tests/test_unixccompiler.py
--- a/distutils2/tests/test_unixccompiler.py
+++ b/distutils2/tests/test_unixccompiler.py
@@ -7,7 +7,7 @@
     from distutils2._backport import sysconfig
 
 from distutils2.compiler.unixccompiler import UnixCCompiler
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 
 class UnixCCompilerTestCase(unittest.TestCase):
 
diff --git a/distutils2/tests/test_upload.py b/distutils2/tests/test_upload.py
--- a/distutils2/tests/test_upload.py
+++ b/distutils2/tests/test_upload.py
@@ -6,9 +6,8 @@
 from distutils2.command.upload import upload
 from distutils2.core import Distribution
 
-from distutils2.tests import support
+from distutils2.tests import unittest, support
 from distutils2.tests.pypi_server import PyPIServer, PyPIServerTestCase
-from distutils2.tests.support import unittest
 
 
 PYPIRC_NOPASSWORD = """\
diff --git a/distutils2/tests/test_upload_docs.py b/distutils2/tests/test_upload_docs.py
--- a/distutils2/tests/test_upload_docs.py
+++ b/distutils2/tests/test_upload_docs.py
@@ -16,9 +16,8 @@
 from distutils2.core import Distribution
 from distutils2.errors import DistutilsFileError, DistutilsOptionError
 
-from distutils2.tests import support
+from distutils2.tests import unittest, support
 from distutils2.tests.pypi_server import PyPIServer, PyPIServerTestCase
-from distutils2.tests.support import unittest
 
 
 EXPECTED_MULTIPART_OUTPUT = "\r\n".join([
diff --git a/distutils2/tests/test_util.py b/distutils2/tests/test_util.py
--- a/distutils2/tests/test_util.py
+++ b/distutils2/tests/test_util.py
@@ -7,7 +7,7 @@
 import time
 
 from distutils2.tests import captured_stdout
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 from distutils2.errors import (DistutilsPlatformError,
                                DistutilsByteCompileError,
                                DistutilsFileError,
@@ -21,8 +21,7 @@
                              read_pypirc, resolve_name)
 
 from distutils2 import util
-from distutils2.tests import support
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support
 
 
 PYPIRC = """\
diff --git a/distutils2/tests/test_version.py b/distutils2/tests/test_version.py
--- a/distutils2/tests/test_version.py
+++ b/distutils2/tests/test_version.py
@@ -6,7 +6,7 @@
 from distutils2.version import HugeMajorVersionNumError, IrrationalVersionError
 from distutils2.version import suggest_normalized_version as suggest
 from distutils2.version import VersionPredicate
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 
 class VersionTestCase(unittest.TestCase):
 
diff --git a/runtests-cov.py b/runtests-cov.py
--- a/runtests-cov.py
+++ b/runtests-cov.py
@@ -136,7 +136,7 @@
 
 if __name__ == "__main__":
     try:
-        import unittest2
+        from distutils2.tests import unittest
     except ImportError:
         sys.stderr.write('Error: You have to install unittest2\n')
         sys.exit(1)

--
Repository URL: http://hg.python.org/distutils2

More information about the Python-checkins mailing list