Branch merge

53 files changed, 113 insertions, 116 deletions

diff --git a/distutils2/command/bdist_msi.py b/distutils2/command/bdist_msi.py
index 61968ad..3728fe5 100644
--- a/distutils2/command/bdist_msi.py
+++ b/distutils2/command/bdist_msi.py
@@ -10,11 +10,11 @@ import sys, os
 from sysconfig import get_python_version
 
 from distutils2.core import Command
-from distutils2.dir_util import remove_tree
 from distutils2.version import StrictVersion
 from distutils2.errors import DistutilsOptionError
 from distutils2 import log
 from distutils2.util import get_platform
+from distutils2._backport.shutil import rmtree
 
 import msilib
 from msilib import schema, sequence, text
@@ -259,7 +259,9 @@ class bdist_msi (Command):
             self.distribution.dist_files.append(tup)
 
         if not self.keep_temp:
-            remove_tree(self.bdist_dir, dry_run=self.dry_run)
+            log.info("removing temporary build directory %s", self.bdist_dir)
+            if not self.dry_run:
+                rmtree(self.bdist_dir)
 
     def add_files(self):
         db = self.db
diff --git a/distutils2/command/build_ext.py b/distutils2/command/build_ext.py
index 405c594..bb63596 100644
--- a/distutils2/command/build_ext.py
+++ b/distutils2/command/build_ext.py
@@ -31,7 +31,7 @@ else:
     HAS_USER_SITE = True
 
 if os.name == 'nt':
-    from distutils2.msvccompiler import get_build_version
+    from distutils2.compiler.msvccompiler import get_build_version
     MSVC_VERSION = int(get_build_version())
 
 # An extension name is just a dot-separated list of Python NAMEs (ie.
diff --git a/distutils2/command/upload_docs.py b/distutils2/command/upload_docs.py
index d53dd03..79f204f 100644
--- a/distutils2/command/upload_docs.py
+++ b/distutils2/command/upload_docs.py
@@ -84,6 +84,8 @@ class upload_docs(Command):
         if self.upload_dir is None:
             build = self.get_finalized_command('build')
             self.upload_dir = os.path.join(build.build_base, "docs")
+            if not os.path.isdir(self.upload_dir):
+                self.upload_dir = os.path.join(build.build_base, "doc")
         self.announce('Using upload directory %s' % self.upload_dir)
         self.verify_upload_dir(self.upload_dir)
         config = read_pypirc(self.repository, self.realm)
diff --git a/distutils2/compiler/msvccompiler.py b/distutils2/compiler/msvccompiler.py
index d2b049f..520f514 100644
--- a/distutils2/compiler/msvccompiler.py
+++ b/distutils2/compiler/msvccompiler.py
@@ -654,6 +654,6 @@ class MSVCCompiler (CCompiler) :
 if get_build_version() >= 8.0:
     log.debug("Importing new compiler from distutils.msvc9compiler")
     OldMSVCCompiler = MSVCCompiler
-    from distutils2.msvc9compiler import MSVCCompiler
+    from distutils2.compiler.msvc9compiler import MSVCCompiler
     # get_build_architecture not really relevant now we support cross-compile
-    from distutils2.msvc9compiler import MacroExpander
+    from distutils2.compiler.msvc9compiler import MacroExpander
diff --git a/distutils2/tests/__init__.py b/distutils2/tests/__init__.py
index a459bda..cc12043 100644
--- a/distutils2/tests/__init__.py
+++ b/distutils2/tests/__init__.py
@@ -10,15 +10,22 @@ included in distutils2.tests as well, instead of using a separate
 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
index 2db4577..a009e61 100644
--- a/distutils2/tests/pypi_server.py
+++ b/distutils2/tests/pypi_server.py
@@ -40,7 +40,7 @@ from BaseHTTPServer import HTTPServer
 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
index 2a14412..d9f8ce1 100644
--- 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 copy import deepcopy
 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
index 186d128..2ffd248 100644
--- a/distutils2/tests/test_Mixin2to3.py
+++ b/distutils2/tests/test_Mixin2to3.py
@@ -3,8 +3,7 @@ import sys
 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
index 2be01e1..3df4d9f 100644
--- a/distutils2/tests/test_bdist.py
+++ b/distutils2/tests/test_bdist.py
@@ -6,8 +6,7 @@ from distutils2.tests import run_unittest
 
 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
index a33210e..ffe98b9 100644
--- a/distutils2/tests/test_bdist_dumb.py
+++ b/distutils2/tests/test_bdist_dumb.py
@@ -10,8 +10,7 @@ try:
 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
index 0d3bda8..5ec898a 100644
--- a/distutils2/tests/test_bdist_msi.py
+++ b/distutils2/tests/test_bdist_msi.py
@@ -3,8 +3,7 @@ import sys
 
 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
index f154463..5584b81 100644
--- 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
index 1245111..016ee74 100644
--- a/distutils2/tests/test_build.py
+++ b/distutils2/tests/test_build.py
@@ -3,8 +3,7 @@ import os
 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
index b8d51d4..a8557f4 100644
--- a/distutils2/tests/test_build_clib.py
+++ b/distutils2/tests/test_build_clib.py
@@ -4,9 +4,8 @@ import sys
 
 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
index 9b1ee45..8eb4106 100644
--- a/distutils2/tests/test_build_ext.py
+++ b/distutils2/tests/test_build_ext.py
@@ -4,7 +4,7 @@ import shutil
 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
index 4ee15f1..f3e330e 100644
--- a/distutils2/tests/test_build_py.py
+++ b/distutils2/tests/test_build_py.py
@@ -8,8 +8,7 @@ from distutils2.command.build_py import build_py
 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
index 3982d99..e7624cd 100644
--- a/distutils2/tests/test_build_scripts.py
+++ b/distutils2/tests/test_build_scripts.py
@@ -9,8 +9,7 @@ try:
 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
index df25253..3ca5217 100644
--- a/distutils2/tests/test_ccompiler.py
+++ b/distutils2/tests/test_ccompiler.py
@@ -4,8 +4,7 @@ from distutils2.tests import captured_stdout
 
 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
index 02e2484..93da1f2 100644
--- 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
index acc5b66..eabec8a 100644
--- 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
index c768f79..a8b36f5 100644
--- a/distutils2/tests/test_cmd.py
+++ b/distutils2/tests/test_cmd.py
@@ -5,7 +5,7 @@ from distutils2.tests import captured_stdout, run_unittest
 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
index d163cd6..82f8f84 100644
--- a/distutils2/tests/test_config.py
+++ b/distutils2/tests/test_config.py
@@ -4,8 +4,7 @@ import sys
 from StringIO import StringIO
 
 from distutils2.core import setup
-from distutils2.tests import support, run_unittest
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest, support, run_unittest
 
 
 SETUP_CFG = """
@@ -20,7 +19,7 @@ class ConfigTestCase(support.TempdirManager,
 
     def setUp(self):
         super(ConfigTestCase, self).setUp()
-        self.addCleanup(setattr, sys, 'argv', sys.argv)
+        self.addCleanup(setattr, sys, 'argv', sys.argv[:])
         self.addCleanup(setattr, sys, 'stdout', sys.stdout)
         self.addCleanup(os.chdir, os.getcwd())
 
diff --git a/distutils2/tests/test_config_cmd.py b/distutils2/tests/test_config_cmd.py
index eab12fd..cf4bbe1 100644
--- a/distutils2/tests/test_config_cmd.py
+++ b/distutils2/tests/test_config_cmd.py
@@ -3,8 +3,7 @@ import os
 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
index 883187e..11c5561 100644
--- a/distutils2/tests/test_core.py
+++ b/distutils2/tests/test_core.py
@@ -6,8 +6,7 @@ import os
 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
index 5516fbd..679f447 100644
--- a/distutils2/tests/test_cygwinccompiler.py
+++ b/distutils2/tests/test_cygwinccompiler.py
@@ -15,8 +15,7 @@ from distutils2.compiler.cygwinccompiler import (CygwinCCompiler, check_config_h
                                        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
index fa38b91..776f279 100644
--- 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
index 4cbcbad..76e74ed 100644
--- a/distutils2/tests/test_dist.py
+++ b/distutils2/tests/test_dist.py
@@ -11,8 +11,8 @@ from distutils2.dist import Distribution, fix_help_options
 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
index 5b042dc..0570f36 100644
--- a/distutils2/tests/test_emxccompiler.py
+++ b/distutils2/tests/test_emxccompiler.py
@@ -7,8 +7,7 @@ from distutils2.tests import captured_stdout
 
 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
index d98ce43..4451dc6 100644
--- 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
index 9020635..db2df1d 100644
--- a/distutils2/tests/test_index_dist.py
+++ b/distutils2/tests/test_index_dist.py
@@ -4,7 +4,8 @@ import os
 
 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
index d21bda5..8d26ae0 100644
--- a/distutils2/tests/test_index_simple.py
+++ b/distutils2/tests/test_index_simple.py
@@ -6,8 +6,7 @@ import os
 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)
 
@@ -20,7 +19,7 @@ class SimpleCrawlerTestCase(support.TempdirManager, unittest.TestCase):
         urls
         """
         if hosts is None:
-            hosts = (server.full_address.strip("http://"),)
+            hosts = (server.full_address.replace("http://", ""),)
         kwargs['hosts'] = hosts
         return Crawler(server.full_address + base_url, *args,
             **kwargs)
diff --git a/distutils2/tests/test_index_xmlrpc.py b/distutils2/tests/test_index_xmlrpc.py
index 50ea739..986a743 100644
--- 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
index 783d3fc..87e3e80 100644
--- a/distutils2/tests/test_install.py
+++ b/distutils2/tests/test_install.py
@@ -17,8 +17,7 @@ from distutils2.command import install as install_module
 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
index 9cae44a..d675de0 100644
--- a/distutils2/tests/test_install_data.py
+++ b/distutils2/tests/test_install_data.py
@@ -4,8 +4,7 @@ import os
 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
index 1bad24b..07f8b1f 100644
--- a/distutils2/tests/test_install_distinfo.py
+++ b/distutils2/tests/test_install_distinfo.py
@@ -7,8 +7,7 @@ import csv
 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
index 5e40257..aa79ddd 100644
--- a/distutils2/tests/test_install_headers.py
+++ b/distutils2/tests/test_install_headers.py
@@ -4,8 +4,7 @@ import os
 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
index 75eb69e..9bb7b2c 100644
--- a/distutils2/tests/test_install_lib.py
+++ b/distutils2/tests/test_install_lib.py
@@ -4,9 +4,8 @@ import os
 
 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
index 2cfab03..89184e5 100644
--- a/distutils2/tests/test_install_scripts.py
+++ b/distutils2/tests/test_install_scripts.py
@@ -5,8 +5,7 @@ import os
 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
index 2db4add..90020ab 100644
--- 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
index 13893eb..bb8c96c 100644
--- a/distutils2/tests/test_manifest.py
+++ b/distutils2/tests/test_manifest.py
@@ -4,8 +4,7 @@ import sys
 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
index 931f1ba..e05a713 100644
--- a/distutils2/tests/test_metadata.py
+++ b/distutils2/tests/test_metadata.py
@@ -6,8 +6,8 @@ from StringIO import StringIO
 
 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
index eea83fa..c6d4330 100644
--- a/distutils2/tests/test_msvc9compiler.py
+++ b/distutils2/tests/test_msvc9compiler.py
@@ -3,8 +3,7 @@ import sys
 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
index 65061ec..d8f2fcb 100644
--- a/distutils2/tests/test_pypi_server.py
+++ b/distutils2/tests/test_pypi_server.py
@@ -4,7 +4,7 @@ import urllib2
 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
index bbb9395..f7fe22e 100644
--- a/distutils2/tests/test_pypi_versions.py
+++ b/distutils2/tests/test_pypi_versions.py
@@ -18,8 +18,7 @@ except ImportError:
    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
index 149161b..3113e80 100644
--- a/distutils2/tests/test_register.py
+++ b/distutils2/tests/test_register.py
@@ -16,9 +16,7 @@ from distutils2.command.register import register
 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]
@@ -67,8 +65,10 @@ class FakeOpener(object):
     def read(self):
         return 'xxx'
 
-class RegisterTestCase(support.TempdirManager, support.EnvironGuard,
-                       support.LoggingCatcher, unittest.TestCase):
+class RegisterTestCase(support.TempdirManager,
+                       support.EnvironGuard,
+                       support.LoggingCatcher,
+                       unittest.TestCase):
 
     def setUp(self):
         super(RegisterTestCase, self).setUp()
diff --git a/distutils2/tests/test_sdist.py b/distutils2/tests/test_sdist.py
index 2bd1dfd..8fe76a4 100644
--- a/distutils2/tests/test_sdist.py
+++ b/distutils2/tests/test_sdist.py
@@ -26,7 +26,7 @@ from distutils2.tests import captured_stdout
 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
index fcc2136..5e4c03f 100644
--- a/distutils2/tests/test_test.py
+++ b/distutils2/tests/test_test.py
@@ -9,9 +9,11 @@ from os.path import join
 from operator import getitem, setitem, delitem
 from StringIO import StringIO
 from distutils2.core import Command
-from distutils2.tests.support import unittest, TempdirManager, LoggingCatcher
+from distutils2.tests import unittest
+from distutils2.tests.support import TempdirManager, LoggingCatcher
 from distutils2.command.test import test
 from distutils2.dist import Distribution
+from distutils2._backport import pkgutil
 
 try:
     any
@@ -40,6 +42,7 @@ class TestTest(TempdirManager,
         os.environ['PYTHONPATH'] = distutils2path + os.pathsep + self.old_pythonpath
 
     def tearDown(self):
+        pkgutil.clear_cache()
         os.environ['PYTHONPATH'] = self.old_pythonpath
         super(TestTest, self).tearDown()
 
diff --git a/distutils2/tests/test_unixccompiler.py b/distutils2/tests/test_unixccompiler.py
index 6de616a..5126746 100644
--- a/distutils2/tests/test_unixccompiler.py
+++ b/distutils2/tests/test_unixccompiler.py
@@ -7,7 +7,7 @@ except ImportError:
     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
index a12e227..df8ae91 100644
--- a/distutils2/tests/test_upload.py
+++ b/distutils2/tests/test_upload.py
@@ -6,9 +6,8 @@ import sys
 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
index f7e323d..c9c4b91 100644
--- a/distutils2/tests/test_upload_docs.py
+++ b/distutils2/tests/test_upload_docs.py
@@ -16,9 +16,8 @@ from distutils2.command.upload_docs import (upload_docs, zip_dir,
 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([
@@ -76,6 +75,19 @@ class UploadDocsTestCase(support.TempdirManager, support.EnvironGuard,
         finally:
             os.chdir(previous)
 
+    def test_default_uploaddir_looks_for_doc_also(self):
+        sandbox = self.mkdtemp()
+        previous = os.getcwd()
+        os.chdir(sandbox)
+        try:
+            os.mkdir("build")
+            self.prepare_sample_dir("build")
+            os.rename(os.path.join("build", "docs"), os.path.join("build", "doc"))
+            self.cmd.ensure_finalized()
+            self.assertEqual(self.cmd.upload_dir, os.path.join("build", "doc"))
+        finally:
+            os.chdir(previous)
+
     def prepare_sample_dir(self, sample_dir=None):
         if sample_dir is None:
             sample_dir = self.mkdtemp()
diff --git a/distutils2/tests/test_util.py b/distutils2/tests/test_util.py
index 0907433..785f434 100644
--- a/distutils2/tests/test_util.py
+++ b/distutils2/tests/test_util.py
@@ -7,7 +7,7 @@ import subprocess
 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 @@ from distutils2.util import (convert_path, change_root,
                              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
index 1e392f2..c69ef3f 100644
--- a/distutils2/tests/test_version.py
+++ b/distutils2/tests/test_version.py
@@ -6,7 +6,7 @@ from distutils2.version import NormalizedVersion as V
 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):
 
@@ -31,6 +31,17 @@ class VersionTestCase(unittest.TestCase):
         for v, s in self.versions:
             self.assertEqual(str(v), s)
 
+    def test_hash(self):
+
+        for v, s in self.versions:
+            self.assertEqual(hash(v), hash(V(s)))
+
+        versions = set([v for v,s in self.versions])
+        for v, s in self.versions:
+            self.assertIn(v, versions)
+
+        self.assertEqual(set([V('1.0')]), set([V('1.0'), V('1.0')]))
+
     def test_from_parts(self):
 
         for v, s in self.versions:
@@ -188,6 +199,10 @@ class VersionTestCase(unittest.TestCase):
         # XXX need to silent the micro version in this case
         #assert not VersionPredicate('Ho (<3.0,!=2.6)').match('2.6.3')
 
+        # test repr
+        for predicate in predicates:
+            self.assertEqual(str(VersionPredicate(predicate)), predicate)
+
     def test_predicate_name(self):
         # Test that names are parsed the right way
 
diff --git a/distutils2/version.py b/distutils2/version.py
index 64c33f7..830c0eb 100644
--- a/distutils2/version.py
+++ b/distutils2/version.py
@@ -131,7 +131,7 @@ class NormalizedVersion(object):
                        pad_zeros_length=0):
         """Parse 'N.N.N' sequences, return a list of ints.
 
-        @param s {str} 'N.N.N..." sequence to be parsed
+        @param s {str} 'N.N.N...' sequence to be parsed
         @param full_ver_str {str} The full version string from which this
             comes. Used for error strings.
         @param drop_trailing_zeros {bool} Whether to drop trailing zeros
@@ -206,7 +206,8 @@ class NormalizedVersion(object):
         return self.__eq__(other) or self.__gt__(other)
 
     # See http://docs.python.org/reference/datamodel#object.__hash__
-    __hash__ = object.__hash__
+    def __hash__(self):
+        return hash(self.parts)
 
 
 def suggest_normalized_version(s):