Merge lp:~vila/bzr/794960-wrong-deprecations into lp:bzr/2.3

[Vincent Ladeuil]

Remove abusive deprecation decorators

Trivial fix, the backport was too aggressive.

While it's too late for 2.3.3 others may run into it for no good reason.

[Vincent Ladeuil (vila)]

Care must be taken when merging 2.3 into trunk for *preserving* this code in trunk

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2011-05-13 10:59:20 +0000
+++ bzrlib/tests/__init__.py	2011-06-09 12:34:31 +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'
--- bzrlib/tests/test_selftest.py	2011-05-13 11:34:44 +0000
+++ bzrlib/tests/test_selftest.py	2011-06-09 12:34:31 +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'
--- doc/en/release-notes/bzr-2.3.txt	2011-05-18 09:04:37 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2011-06-09 12:34:31 +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
 #########