Rev 4805: Cleaned up as per vincent's suggestions. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-accepted

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-accepted

------------------------------------------------------------
revno: 4805
revision-id: john at arbash-meinel.com-20091116200544-0qzxaaxvyjr33e23
parent: john at arbash-meinel.com-20091116200414-0fdsqc4anzdv6q3h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-win32-accepted
timestamp: Mon 2009-11-16 14:05:44 -0600
message:
  Cleaned up as per vincent's suggestions.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-11-08 03:25:29 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-11-16 20:05:44 +0000
@@ -785,11 +785,9 @@
             # If we happen to have a tree, we'll guarantee everything
             # except for the tree root is the same.
             inventory_f = file(local_inventory, 'rb')
-            try:
-                self.assertContainsRe(inventory_f.read(),
-                                      '<inventory format="5">\n</inventory>\n')
-            finally:
-                inventory_f.close()
+            self.addCleanup(inventory_f.close)
+            self.assertContainsRe(inventory_f.read(),
+                                  '<inventory format="5">\n</inventory>\n')
         except IOError, e:
             if e.errno != errno.ENOENT:
                 raise