Rev 5651: (vila) Remove abusive deprecation decorators (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.3/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.3/

------------------------------------------------------------
revno: 5651 [merge]
revision-id: pqm at pqm.ubuntu.com-20110609145625-av5fshuaujij0qe8
parent: pqm at pqm.ubuntu.com-20110524112316-6nv9mvjm7nai7znr
parent: v.ladeuil+lp at free.fr-20110609122832-ovqtzt33m7r9ufdg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Thu 2011-06-09 14:56:25 +0000
message:
  (vila) Remove abusive deprecation decorators (Vincent Ladeuil)
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2011-05-13 10:59:20 +0000
+++ b/bzrlib/tests/__init__.py	2011-06-09 12:17:09 +0000
@@ -1450,7 +1450,6 @@
         else:
             self.assertEqual(expected_docstring, obj.__doc__)
 
-    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4)))
     def failUnlessExists(self, path):
         return self.assertPathExists(path)
 
@@ -1463,7 +1462,6 @@
             self.assertTrue(osutils.lexists(path),
                 path + " does not exist")
 
-    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4)))
     def failIfExists(self, path):
         return self.assertPathDoesNotExist(path)
 

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2011-05-13 11:34:44 +0000
+++ b/bzrlib/tests/test_selftest.py	2011-06-09 12:28:32 +0000
@@ -512,19 +512,6 @@
         self.assertRaises(AssertionError, self.assertEqualStat,
             os.lstat("foo"), os.lstat("longname"))
 
-    def test_failUnlessExists(self):
-        """Deprecated failUnlessExists and failIfExists"""
-        self.applyDeprecated(
-            deprecated_in((2, 4)),
-            self.failUnlessExists, '.')
-        self.build_tree(['foo/', 'foo/bar'])
-        self.applyDeprecated(
-            deprecated_in((2, 4)),
-            self.failUnlessExists, 'foo/bar')
-        self.applyDeprecated(
-            deprecated_in((2, 4)),
-            self.failIfExists, 'foo/foo')
-
     def test_assertPathExists(self):
         self.assertPathExists('.')
         self.build_tree(['foo/', 'foo/bar'])

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-05-18 09:04:37 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-06-09 12:17:09 +0000
@@ -61,6 +61,10 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* Remove the deprecation decorators for ``failUnlessExists`` and
+  ``failIfExists``. The deprecation "will" occur in 2.4, not
+  before. Providing the wrappers is enough as far as 2.3 is concerned.
+  (Vincent Ladeuil #794960)
 
 bzr 2.3.3
 #########