Bow to the will of pep8 and pyflakes

3 files changed, 12 insertions, 11 deletions

diff --git a/src/distutils2/command/install_distinfo.py b/src/distutils2/command/install_distinfo.py
index bec7834..0eb60c5 100644
--- a/src/distutils2/command/install_distinfo.py
+++ b/src/distutils2/command/install_distinfo.py
@@ -116,8 +116,8 @@ class install_distinfo(Command):
                 f = open(record_path, 'wb')
                 try:
                     writer = csv.writer(f, delimiter=',',
-                                           lineterminator=os.linesep,
-                                           quotechar='"')
+                                        lineterminator=os.linesep,
+                                        quotechar='"')
 
                     install = self.get_finalized_command('install')
 
diff --git a/src/distutils2/command/test.py b/src/distutils2/command/test.py
index 5ba55fe..d64ebd3 100644
--- a/src/distutils2/command/test.py
+++ b/src/distutils2/command/test.py
@@ -2,7 +2,6 @@ import os
 import sys
 import unittest
 
-from distutils2 import log
 from distutils2.core import Command
 from distutils2.errors import DistutilsOptionError
 from distutils2.util import resolve_name
@@ -12,6 +11,7 @@ try:
 except ImportError:
     from distutils2._backport.pkgutil import get_distribution
 
+
 class test(Command):
 
     description = "run the distribution's test suite"
@@ -34,13 +34,14 @@ class test(Command):
         self.build_lib = self.get_finalized_command("build").build_lib
         for requirement in self.tests_require:
             if get_distribution(requirement) is None:
-        if not self.suite and not self.runner and self.get_ut_with_discovery() is None:
-    
                 self.announce("test dependency %s is not installed, "
                               "tests may fail" % requirement)
+        if (not self.suite and not self.runner and
+            self.get_ut_with_discovery() is None):
             raise DistutilsOptionError(
                 "no test discovery available, please give a 'suite' or "
                 "'runner' option or install unittest2")
+
     def get_ut_with_discovery(self):
         if hasattr(unittest.TestLoader, "discover"):
             return unittest
@@ -63,10 +64,12 @@ class test(Command):
             if self.runner:
                 resolve_name(self.runner)()
             elif self.suite:
-                unittest.TextTestRunner(verbosity=self.verbose + 1).run(resolve_name(self.suite)())
+                runner = unittest.TextTestRunner(verbosity=self.verbose + 1)
+                runner.run(resolve_name(self.suite)())
             elif self.get_ut_with_discovery():
-                discovery_ut = self.get_ut_with_discovery()
-                test_suite = discovery_ut.TestLoader().discover(os.curdir)
-                discovery_ut.TextTestRunner(verbosity=self.verbose + 1).run(test_suite)
+                ut = self.get_ut_with_discovery()
+                test_suite = ut.TestLoader().discover(os.curdir)
+                runner = ut.TextTestRunner(verbosity=self.verbose + 1)
+                runner.run(test_suite)
         finally:
             sys.path[:] = prev_syspath
diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py
index 8489e27..4cbcbad 100644
--- a/src/distutils2/tests/test_dist.py
+++ b/src/distutils2/tests/test_dist.py
@@ -4,7 +4,6 @@
 import os
 import StringIO
 import sys
-import warnings
 import textwrap
 
 import distutils2.dist
@@ -259,7 +258,6 @@ class DistributionTestCase(support.TempdirManager,
 
         self.assertEqual(cmd.pre_hook, {"a": 'type', "b": 'type'})
 
-
     def test_hooks_get_run(self):
         temp_home = self.mkdtemp()
         config_file = os.path.join(temp_home, "config1.cfg")