Bazaar

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

  1. 2.0.2-deprecation-warnings-440062
  2. Merge into 2.0
Proposed by John A Meinel
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~jameinel/bzr/2.0.2-deprecation-warnings-440062
Merge into: lp://staging/bzr/2.0
Diff against target: 26 lines
2 files modified
NEWS (+3/-0)
bzrlib/commands.py (+1/-1)
To merge this branch: bzr merge lp://staging/~jameinel/bzr/2.0.2-deprecation-warnings-440062
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+13293@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

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. :)

Revision history for this message
Robert Collins (lifeless) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2009-10-09 15:05:39 +0000
3+++ NEWS 2009-10-13 20:15:21 +0000
4@@ -38,6 +38,9 @@
5 ``/``, but that is not true when working at the root of the filesystem.
6 (John Arbash Meinel, Jason Spashett, #322807)
7
8+* Hide deprecation warnings for 'final' releases for python2.6.
9+ (John Arbash Meinel, #440062)
10+
11 * Improve the time for ``bzr log DIR`` for 2a format repositories.
12 We had been using the same code path as for <2a formats, which required
13 iterating over all objects in all revisions.
14
15=== modified file 'bzrlib/commands.py'
16--- bzrlib/commands.py 2009-09-09 14:21:37 +0000
17+++ bzrlib/commands.py 2009-10-13 20:15:21 +0000
18@@ -1097,7 +1097,7 @@
19
20 # Is this a final release version? If so, we should suppress warnings
21 if bzrlib.version_info[3] == 'final':
22- suppress_deprecation_warnings(override=False)
23+ suppress_deprecation_warnings(override=True)
24 if argv is None:
25 argv = osutils.get_unicode_argv()
26 else:

Subscribers

People subscribed via source and target branches