[Python-checkins] distutils2: Merge Kelsey changes

tarek.ziade python-checkins at python.org
Wed Feb 16 22:23:59 CET 2011


tarek.ziade pushed 53e2bbd550a2 to distutils2:

http://hg.python.org/distutils2/rev/53e2bbd550a2
changeset:   1095:53e2bbd550a2
parent:      1093:422fcb29d738
parent:      1094:bf37a129641b
user:        Alexis Metaireau <alexis at notmyidea.org>
date:        Sun Feb 13 23:29:08 2011 +0000
summary:
  Merge Kelsey changes

files:
  

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
@@ -1,15 +1,14 @@
 """Tests for the distutils2.install module."""
 
 import os
+
 from tempfile import mkstemp
-
 from distutils2 import install
 from distutils2.index.xmlrpc import Client
 from distutils2.metadata import Metadata
 from distutils2.tests import run_unittest
-from distutils2.tests.support import TempdirManager
+from distutils2.tests.support import LoggingCatcher, TempdirManager, unittest
 from distutils2.tests.pypi_server import use_xmlrpc_server
-from distutils2.tests.support import unittest
 
 
 class InstalledDist(object):
@@ -84,7 +83,7 @@
     return objects
 
 
-class TestInstall(TempdirManager, unittest.TestCase):
+class TestInstall(LoggingCatcher, TempdirManager, unittest.TestCase):
     def _get_client(self, server, *args, **kwargs):
         return Client(server.full_address, *args, **kwargs)
 

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


More information about the Python-checkins mailing list