Merge lp:~jameinel/bzr/2.0.2-deprecation-warnings-440062 into lp:bzr/2.0

[John A Meinel]

[John A Meinel (jameinel)]

Python 2.6 now 'comes with' a deprecation warning suppression as part of
the threading module. So the current check that says 'if someone manually
configured a deprecation warning filter, don't add ours' now breaks
because there is always one present.
So instead, we just always suppress all deprecation warnings if we are in
a 'final' release.

Whether this lands in 2.0.1 or 2.0.2 just depends on how quickly it gets reviewed versus how long it takes the admins to create a 2.0.1 branch for me. :)

[Robert Collins (lifeless)]

On Tue, 2009-10-13 at 17:10 +0000, John A Meinel wrote:
>
> Python 2.6 now 'comes with' a deprecation warning suppression as part
> of
> the threading module.

WOW. Thats so... bong.

 +1

=== modified file 'NEWS'
--- NEWS	2009-10-09 15:05:39 +0000
+++ NEWS	2009-10-13 20:15:21 +0000
@@ -38,6 +38,9 @@
   ``/``, but that is not true when working at the root of the filesystem.
   (John Arbash Meinel, Jason Spashett, #322807)
 
+* Hide deprecation warnings for 'final' releases for python2.6.
+  (John Arbash Meinel, #440062)
+
 * Improve the time for ``bzr log DIR`` for 2a format repositories.
   We had been using the same code path as for <2a formats, which required
   iterating over all objects in all revisions.

=== modified file 'bzrlib/commands.py'
--- bzrlib/commands.py	2009-09-09 14:21:37 +0000
+++ bzrlib/commands.py	2009-10-13 20:15:21 +0000
@@ -1097,7 +1097,7 @@
 
     # Is this a final release version? If so, we should suppress warnings
     if bzrlib.version_info[3] == 'final':
-        suppress_deprecation_warnings(override=False)
+        suppress_deprecation_warnings(override=True)
     if argv is None:
         argv = osutils.get_unicode_argv()
     else: