Clean some imports.

setuptools/command/install_egg_info.py

 from setuptools import Command
 from setuptools.archive_util import unpack_archive
 from distutils import log, dir_util
-import os, shutil, pkg_resources
+import os, pkg_resources
 
 class install_egg_info(Command):
     """Install an .egg-info directory for the package"""

setuptools/svn_utils.py

@@ -4,7 +4,6 @@ import sys
 from distutils import log
 import xml.dom.pulldom
 import shlex
-import shutil
 import locale
 import codecs
 import unicodedata

setuptools/tests/test_bdist_egg.py

 """develop tests
 """
+import os
+import re
+import shutil
+import site
 import sys
-import os, re, shutil, tempfile, unittest
 import tempfile
-import site
+import unittest
 
 from distutils.errors import DistutilsError
 from setuptools.compat import StringIO

setuptools/tests/test_build_ext.py

 """build_ext tests
 """
-import os, shutil, tempfile, unittest
+import unittest
 from distutils.command.build_ext import build_ext as distutils_build_ext
 from setuptools.command.build_ext import build_ext
 from setuptools.dist import Distribution
@@ -17,4 +17,3 @@ class TestBuildExtTest(unittest.TestCase):
         res = cmd.get_ext_filename('foo')
         wanted = distutils_build_ext.get_ext_filename(cmd, 'foo')
         assert res == wanted
-

setuptools/tests/test_develop.py

 """develop tests
 """
+import os
+import shutil
+import site
 import sys
-import os, shutil, tempfile, unittest
 import tempfile
-import site
+import unittest
 
 from distutils.errors import DistutilsError
 from setuptools.command.develop import develop

setuptools/tests/test_test.py

@@ -2,10 +2,12 @@
 
 """develop tests
 """
+import os
+import shutil
+import site
 import sys
-import os, shutil, tempfile, unittest
 import tempfile
-import site
+import unittest
 
 from distutils.errors import DistutilsError
 from setuptools.compat import StringIO