[Python-checkins] distutils2: Minor cleanup in test_dist

[tarek.ziade]

tarek.ziade pushed 03070e887c5c to distutils2:

http://hg.python.org/distutils2/rev/03070e887c5c
changeset:   794:03070e887c5c
user:        ?ric Araujo <merwok at netwok.org>
date:        Fri Oct 22 01:07:50 2010 +0200
summary:     Minor cleanup in test_dist
files:       distutils2/tests/test_dist.py

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
@@ -194,7 +194,7 @@
         cmds = dist.get_command_packages()
         self.assertEqual(cmds, ['distutils2.command'])
         self.assertEqual(dist.command_packages,
-                          ['distutils2.command'])
+                         ['distutils2.command'])
 
         dist.command_packages = 'one,two'
         cmds = dist.get_command_packages()
@@ -231,7 +231,7 @@
             all_files = d.find_config_files()
 
             d = distutils2.dist.Distribution(attrs={'script_args':
-                                            ['--no-user-cfg']})
+                                             ['--no-user-cfg']})
             files = d.find_config_files()
         finally:
             os.path.expanduser = old_expander
@@ -444,24 +444,20 @@
         finally:
             f.close()
 
-        try:
-            dist = Distribution()
+        dist = Distribution()
 
-            # linux-style
-            if sys.platform in ('linux', 'darwin'):
-                os.environ['HOME'] = temp_dir
-                files = dist.find_config_files()
-                self.assertTrue(user_filename in files)
+        # linux-style
+        if sys.platform in ('linux', 'darwin'):
+            os.environ['HOME'] = temp_dir
+            files = dist.find_config_files()
+            self.assertTrue(user_filename in files)
 
-            # win32-style
-            if sys.platform == 'win32':
-                # home drive should be found
-                os.environ['HOME'] = temp_dir
-                files = dist.find_config_files()
-                self.assertTrue(user_filename in files,
-                             '%r not found in %r' % (user_filename, files))
-        finally:
-            os.remove(user_filename)
+        # win32-style
+        if sys.platform == 'win32':
+            # home drive should be found
+            os.environ['HOME'] = temp_dir
+            files = dist.find_config_files()
+            self.assertIn(user_filename, files)
 
     def test_fix_help_options(self):
         help_tuples = [('a', 'b', 'c', 'd'), (1, 2, 3, 4)]

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