Rev 6027: Remove the deprecated AtomicFile._get_closed() method and its associated test. in file:///home/vila/src/bzr/cleanup/deprecations/

Vincent Ladeuil v.ladeuil+lp at free.fr
Fri Jul 15 09:04:55 UTC 2011


At file:///home/vila/src/bzr/cleanup/deprecations/

------------------------------------------------------------
revno: 6027
revision-id: v.ladeuil+lp at free.fr-20110715090454-9f9uq2hdrx1sg8tr
parent: pqm at pqm.ubuntu.com-20110715010556-ed5ksz52tkean7oa
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: deprecations
timestamp: Fri 2011-07-15 11:04:54 +0200
message:
  Remove the deprecated AtomicFile._get_closed() method and its associated test.
-------------- next part --------------
=== modified file 'bzrlib/atomicfile.py'
--- a/bzrlib/atomicfile.py	2011-06-28 21:47:24 +0000
+++ b/bzrlib/atomicfile.py	2011-07-15 09:04:54 +0000
@@ -80,13 +80,6 @@
             if stat.S_IMODE(st.st_mode) != new_mode:
                 os.chmod(self.tmpfilename, new_mode)
 
-    def _get_closed(self):
-        symbol_versioning.warn('AtomicFile.closed deprecated in bzr 0.10',
-                               DeprecationWarning, stacklevel=2)
-        return self._fd is None
-
-    closed = property(_get_closed)
-
     def __repr__(self):
         return '%s(%r)' % (self.__class__.__name__,
                            self.realfilename)

=== modified file 'bzrlib/tests/test_atomicfile.py'
--- a/bzrlib/tests/test_atomicfile.py	2011-05-13 12:51:05 +0000
+++ b/bzrlib/tests/test_atomicfile.py	2011-07-15 09:04:54 +0000
@@ -124,30 +124,3 @@
         f.commit()
         st = os.lstat('test')
         self.assertEqualMode(0666 & ~umask, stat.S_IMODE(st.st_mode))
-
-    def test_closed(self):
-        local_warnings = []
-        def capture_warnings(msg, cls, stacklevel=None):
-            self.assertEqual(cls, DeprecationWarning)
-            local_warnings.append(msg)
-
-        method = symbol_versioning.warn
-        try:
-            symbol_versioning.set_warning_method(capture_warnings)
-            f = atomicfile.AtomicFile('test', mode='wb')
-            self.assertEqual(False, f.closed)
-            f.abort()
-            self.assertEqual(True, f.closed)
-
-            f = atomicfile.AtomicFile('test', mode='wb')
-            f.close()
-            self.assertEqual(True, f.closed)
-
-            f = atomicfile.AtomicFile('test', mode='wb')
-            f.commit()
-            self.assertEqual(True, f.closed)
-        finally:
-            symbol_versioning.set_warning_method(method)
-
-        txt = 'AtomicFile.closed deprecated in bzr 0.10'
-        self.assertEqual([txt]*4, local_warnings)



More information about the bazaar-commits mailing list