/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3173.1.3 by Martin Pool
Deprecate disable_default_logging and add 1.2 deprecation marker
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
2227.1.5 by mbp at sourcefrog
doc cleanup
2
#   Authors: Robert Collins <robert.collins@canonical.com> and others
1534.2.1 by Robert Collins
Implement deprecated_method
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
"""Symbol versioning
19
20
The methods here allow for api symbol versioning.
21
"""
22
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
23
__all__ = ['deprecated_function',
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
24
           'deprecated_in',
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
25
           'deprecated_list',
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
26
           'deprecated_method',
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
27
           'DEPRECATED_PARAMETER',
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
28
           'deprecated_passed',
3400.3.1 by Martin Pool
Remove methods deprecated in zero_eight
29
           'set_warning_method',
30
           'warn',
3400.3.6 by Martin Pool
Remove code deprecated prior to 1.1 and its tests
31
           'zero_seven',
32
           'zero_eight',
33
           'zero_nine',
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
34
           'zero_ten',
1711.9.6 by John Arbash Meinel
Add a deprecation symbol for bzr-0.11
35
           'zero_eleven',
2037.1.2 by Robert Collins
(Robert Collins) Add 0.12 deprecation symbol.
36
           'zero_twelve',
2101.1.2 by John Arbash Meinel
Create the 0.13 deprecation symbol
37
           'zero_thirteen',
2150.1.1 by Wouter van Heyst
bzr 0.13rc1 has branch, bump bzr.dev version to 0.14
38
           'zero_fourteen',
2234.1.1 by Wouter van Heyst
0.14rc1 has branch, bump bzr.dev version to 0.15
39
           'zero_fifteen',
2363.5.1 by Aaron Bentley
Unify info display into show_component_info
40
           'zero_sixteen',
2483.1.2 by John Arbash Meinel
Updates for bzr-0.17-dev
41
           'zero_seventeen',
2524.1.1 by Aaron Bentley
Revert broken changes
42
           'zero_eighteen',
2687.2.1 by Martin Pool
Rename upcoming release from 0.19 to 0.90
43
           'zero_ninety',
2697.1.1 by John Arbash Meinel
Switch bzr.dev to 0.91 development
44
           'zero_ninetyone',
2830.2.5 by Martin Pool
Deprecated ``run_bzr_decode``; use the new ``output_encoding`` parameter to
45
           'zero_ninetytwo',
2955.3.1 by Alexander Belchenko
start 0.93 development cycle; deprecate osutils.backup_file
46
           'zero_ninetythree',
3123.1.1 by John Arbash Meinel
Update from deprecating 0.93 to 1.0, and add a 1.1 deprecation.
47
           'one_zero',
48
           'one_one',
3173.1.3 by Martin Pool
Deprecate disable_default_logging and add 1.2 deprecation marker
49
           'one_two',
3221.2.1 by Martin Pool
Open 1.3 development
50
           'one_three',
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
51
           'one_four',
3256.2.29 by Daniel Watkins
Added symbol_versioning.one_five.
52
           'one_five',
3422.1.2 by John Arbash Meinel
Update version in 'bzr' and 'bzrlib/__init__.py'
53
           'one_six',
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
54
           ]
1534.2.1 by Robert Collins
Implement deprecated_method
55
56
from warnings import warn
57
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
58
import bzrlib
59
1534.2.1 by Robert Collins
Implement deprecated_method
60
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
61
DEPRECATED_PARAMETER = "A deprecated parameter marker."
3400.3.6 by Martin Pool
Remove code deprecated prior to 1.1 and its tests
62
zero_seven = "%s was deprecated in version 0.7."
63
zero_eight = "%s was deprecated in version 0.8."
64
zero_nine = "%s was deprecated in version 0.9."
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
65
zero_ten = "%s was deprecated in version 0.10."
1711.9.6 by John Arbash Meinel
Add a deprecation symbol for bzr-0.11
66
zero_eleven = "%s was deprecated in version 0.11."
2037.1.2 by Robert Collins
(Robert Collins) Add 0.12 deprecation symbol.
67
zero_twelve = "%s was deprecated in version 0.12."
2116.1.1 by James Westby
Fix string for deprecation warning for 0.13
68
zero_thirteen = "%s was deprecated in version 0.13."
2150.1.1 by Wouter van Heyst
bzr 0.13rc1 has branch, bump bzr.dev version to 0.14
69
zero_fourteen = "%s was deprecated in version 0.14."
2234.1.1 by Wouter van Heyst
0.14rc1 has branch, bump bzr.dev version to 0.15
70
zero_fifteen = "%s was deprecated in version 0.15."
2363.5.1 by Aaron Bentley
Unify info display into show_component_info
71
zero_sixteen = "%s was deprecated in version 0.16."
2483.1.2 by John Arbash Meinel
Updates for bzr-0.17-dev
72
zero_seventeen = "%s was deprecated in version 0.17."
2524.1.1 by Aaron Bentley
Revert broken changes
73
zero_eighteen = "%s was deprecated in version 0.18."
2687.2.2 by Martin Pool
Fix up other references to 0.19
74
zero_ninety = "%s was deprecated in version 0.90."
2697.1.1 by John Arbash Meinel
Switch bzr.dev to 0.91 development
75
zero_ninetyone = "%s was deprecated in version 0.91."
2830.2.5 by Martin Pool
Deprecated ``run_bzr_decode``; use the new ``output_encoding`` parameter to
76
zero_ninetytwo = "%s was deprecated in version 0.92."
3123.1.1 by John Arbash Meinel
Update from deprecating 0.93 to 1.0, and add a 1.1 deprecation.
77
one_zero = "%s was deprecated in version 1.0."
78
zero_ninetythree = one_zero # Maintained for backwards compatibility
79
one_one = "%s was deprecated in version 1.1."
3173.1.3 by Martin Pool
Deprecate disable_default_logging and add 1.2 deprecation marker
80
one_two = "%s was deprecated in version 1.2."
3221.2.1 by Martin Pool
Open 1.3 development
81
one_three = "%s was deprecated in version 1.3."
3293.1.1 by Martin Pool
Add one_four deprecation
82
one_four = "%s was deprecated in version 1.4."
3256.2.29 by Daniel Watkins
Added symbol_versioning.one_five.
83
one_five = "%s was deprecated in version 1.5."
3422.1.2 by John Arbash Meinel
Update version in 'bzr' and 'bzrlib/__init__.py'
84
one_six = "%s was deprecated in version 1.6."
1534.2.1 by Robert Collins
Implement deprecated_method
85
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
86
87
def deprecated_in(version_tuple):
88
    """Generate a message that something was deprecated in a release.
89
90
    >>> deprecated_in((1, 4, 0))
3427.2.5 by John Arbash Meinel
Change deprecated_in to end with a '.'
91
    '%s was deprecated in version 1.4.'
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
92
    """
3427.2.5 by John Arbash Meinel
Change deprecated_in to end with a '.'
93
    return ("%%s was deprecated in version %s."
94
            % bzrlib._format_version_tuple(version_tuple))
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
95
1534.2.1 by Robert Collins
Implement deprecated_method
96
97
def set_warning_method(method):
98
    """Set the warning method to be used by this module.
99
100
    It should take a message and a warning category as warnings.warn does.
101
    """
102
    global warn
103
    warn = method
104
105
1534.2.2 by Robert Collins
Implement deprecated_function.
106
# TODO - maybe this would be easier to use as one 'smart' method that
107
# guess if it is a method or a class or an attribute ? If so, we can
108
# add that on top of the primitives, once we have all three written
109
# - RBC 20050105
110
1982.3.1 by Robert Collins
New utility function symbol_versioning.deprecation_string. Returns the
111
112
def deprecation_string(a_callable, deprecation_version):
113
    """Generate an automatic deprecation string for a_callable.
114
115
    :param a_callable: The callable to substitute into deprecation_version.
116
    :param deprecation_version: A deprecation format warning string. This should
117
        have a single %s operator in it. a_callable will be turned into a nice
118
        python symbol and then substituted into deprecation_version.
119
    """
2872.5.1 by Martin Pool
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).
120
    # We also want to handle old-style classes, in particular exception, and
121
    # they don't have an im_class attribute.
1982.3.1 by Robert Collins
New utility function symbol_versioning.deprecation_string. Returns the
122
    if getattr(a_callable, 'im_class', None) is None:
123
        symbol = "%s.%s" % (a_callable.__module__,
124
                            a_callable.__name__)
125
    else:
126
        symbol = "%s.%s.%s" % (a_callable.im_class.__module__,
127
                               a_callable.im_class.__name__,
128
                               a_callable.__name__
129
                               )
130
    return deprecation_version % symbol
131
132
1534.2.2 by Robert Collins
Implement deprecated_function.
133
def deprecated_function(deprecation_version):
134
    """Decorate a function so that use of it will trigger a warning."""
135
136
    def function_decorator(callable):
137
        """This is the function python calls to perform the decoration."""
138
        
139
        def decorated_function(*args, **kwargs):
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
140
            """This is the decorated function."""
1982.3.1 by Robert Collins
New utility function symbol_versioning.deprecation_string. Returns the
141
            warn(deprecation_string(callable, deprecation_version),
142
                DeprecationWarning, stacklevel=2)
1534.2.2 by Robert Collins
Implement deprecated_function.
143
            return callable(*args, **kwargs)
1534.2.5 by Robert Collins
Set the __name__ attribute on decorated methods and functions.
144
        _populate_decorated(callable, deprecation_version, "function",
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
145
                            decorated_function)
1534.2.2 by Robert Collins
Implement deprecated_function.
146
        return decorated_function
147
    return function_decorator
148
149
1534.2.1 by Robert Collins
Implement deprecated_method
150
def deprecated_method(deprecation_version):
151
    """Decorate a method so that use of it will trigger a warning.
2825.3.2 by Martin Pool
doc
152
153
    To deprecate a static or class method, use 
154
155
        @staticmethod
156
        @deprecated_function
157
        def ...
1534.2.1 by Robert Collins
Implement deprecated_method
158
    
159
    To deprecate an entire class, decorate __init__.
160
    """
161
162
    def method_decorator(callable):
163
        """This is the function python calls to perform the decoration."""
164
        
165
        def decorated_method(self, *args, **kwargs):
166
            """This is the decorated method."""
2872.5.1 by Martin Pool
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).
167
            if callable.__name__ == '__init__':
168
                symbol = "%s.%s" % (self.__class__.__module__,
169
                                    self.__class__.__name__,
170
                                    )
171
            else:
172
                symbol = "%s.%s.%s" % (self.__class__.__module__,
173
                                       self.__class__.__name__,
174
                                       callable.__name__
175
                                       )
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
176
            warn(deprecation_version % symbol, DeprecationWarning, stacklevel=2)
1534.2.1 by Robert Collins
Implement deprecated_method
177
            return callable(self, *args, **kwargs)
1534.2.5 by Robert Collins
Set the __name__ attribute on decorated methods and functions.
178
        _populate_decorated(callable, deprecation_version, "method",
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
179
                            decorated_method)
1534.2.1 by Robert Collins
Implement deprecated_method
180
        return decorated_method
181
    return method_decorator
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
182
183
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
184
def deprecated_passed(parameter_value):
185
    """Return True if parameter_value was used."""
186
    # FIXME: it might be nice to have a parameter deprecation decorator. 
187
    # it would need to handle positional and *args and **kwargs parameters,
188
    # which means some mechanism to describe how the parameter was being
189
    # passed before deprecation, and some way to deprecate parameters that
190
    # were not at the end of the arg list. Thats needed for __init__ where
191
    # we cannot just forward to a new method name.I.e. in the following
192
    # examples we would want to have callers that pass any value to 'bad' be
193
    # given a warning - because we have applied:
3400.3.4 by Martin Pool
Remove zero_seven deprecations
194
    # @deprecated_parameter('bad', deprecated_in((1, 5, 0))
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
195
    #
196
    # def __init__(self, bad=None)
197
    # def __init__(self, bad, other)
198
    # def __init__(self, **kwargs)
199
    # RBC 20060116
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
200
    return not parameter_value is DEPRECATED_PARAMETER
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
201
202
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
203
def _decorate_docstring(callable, deprecation_version, label,
204
                        decorated_callable):
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
205
    if callable.__doc__:
206
        docstring_lines = callable.__doc__.split('\n')
207
    else:
208
        docstring_lines = []
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
209
    if len(docstring_lines) == 0:
210
        decorated_callable.__doc__ = deprecation_version % ("This " + label)
211
    elif len(docstring_lines) == 1:
212
        decorated_callable.__doc__ = (callable.__doc__ 
213
                                    + "\n"
214
                                    + "\n"
215
                                    + deprecation_version % ("This " + label)
216
                                    + "\n")
217
    else:
218
        spaces = len(docstring_lines[-1])
219
        new_doc = callable.__doc__
220
        new_doc += "\n" + " " * spaces
221
        new_doc += deprecation_version % ("This " + label)
222
        new_doc += "\n" + " " * spaces
223
        decorated_callable.__doc__ = new_doc
1534.2.5 by Robert Collins
Set the __name__ attribute on decorated methods and functions.
224
225
226
def _populate_decorated(callable, deprecation_version, label,
227
                        decorated_callable):
228
    """Populate attributes like __name__ and __doc__ on the decorated callable.
229
    """
230
    _decorate_docstring(callable, deprecation_version, label,
231
                        decorated_callable)
1534.1.3 by Robert Collins
Bugfix the symbol_versioning deprecation decorators to update the
232
    decorated_callable.__module__ = callable.__module__
1534.2.5 by Robert Collins
Set the __name__ attribute on decorated methods and functions.
233
    decorated_callable.__name__ = callable.__name__
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
234
    decorated_callable.is_deprecated = True
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
235
236
2227.1.5 by mbp at sourcefrog
doc cleanup
237
def _dict_deprecation_wrapper(wrapped_method):
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
238
    """Returns a closure that emits a warning and calls the superclass"""
239
    def cb(dep_dict, *args, **kwargs):
240
        msg = 'access to %s' % (dep_dict._variable_name, )
241
        msg = dep_dict._deprecation_version % (msg,)
242
        if dep_dict._advice:
243
            msg += ' ' + dep_dict._advice
244
        warn(msg, DeprecationWarning, stacklevel=2)
2227.1.5 by mbp at sourcefrog
doc cleanup
245
        return wrapped_method(dep_dict, *args, **kwargs)
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
246
    return cb
247
248
249
class DeprecatedDict(dict):
250
    """A dictionary that complains when read or written."""
251
252
    is_deprecated = True
253
254
    def __init__(self,
255
        deprecation_version,
256
        variable_name,
257
        initial_value,
258
        advice,
259
        ):
260
        """Create a dict that warns when read or modified.
261
3400.3.5 by Martin Pool
Remove zero_nine deprecations
262
        :param deprecation_version: string for the warning format to raise,
263
            typically from deprecated_in()
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
264
        :param initial_value: The contents of the dict
265
        :param variable_name: This allows better warnings to be printed
266
        :param advice: String of advice on what callers should do instead 
267
            of using this variable.
268
        """
269
        self._deprecation_version = deprecation_version
270
        self._variable_name = variable_name
271
        self._advice = advice
272
        dict.__init__(self, initial_value)
273
274
    # This isn't every possible method but it should trap anyone using the
275
    # dict -- add more if desired
276
    __len__ = _dict_deprecation_wrapper(dict.__len__)
277
    __getitem__ = _dict_deprecation_wrapper(dict.__getitem__)
278
    __setitem__ = _dict_deprecation_wrapper(dict.__setitem__)
279
    __delitem__ = _dict_deprecation_wrapper(dict.__delitem__)
280
    keys = _dict_deprecation_wrapper(dict.keys)
281
    __contains__ = _dict_deprecation_wrapper(dict.__contains__)
282
283
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
284
def deprecated_list(deprecation_version, variable_name,
285
                    initial_value, extra=None):
286
    """Create a list that warns when modified
287
3400.3.5 by Martin Pool
Remove zero_nine deprecations
288
    :param deprecation_version: string for the warning format to raise,
289
        typically from deprecated_in()
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
290
    :param initial_value: The contents of the list
291
    :param variable_name: This allows better warnings to be printed
292
    :param extra: Extra info to print when printing a warning
293
    """
294
295
    subst_text = 'Modifying %s' % (variable_name,)
296
    msg = deprecation_version % (subst_text,)
297
    if extra:
298
        msg += ' ' + extra
299
300
    class _DeprecatedList(list):
301
        __doc__ = list.__doc__ + msg
302
303
        is_deprecated = True
304
305
        def _warn_deprecated(self, func, *args, **kwargs):
306
            warn(msg, DeprecationWarning, stacklevel=3)
307
            return func(self, *args, **kwargs)
308
            
309
        def append(self, obj):
310
            """appending to %s is deprecated""" % (variable_name,)
311
            return self._warn_deprecated(list.append, obj)
312
313
        def insert(self, index, obj):
314
            """inserting to %s is deprecated""" % (variable_name,)
315
            return self._warn_deprecated(list.insert, index, obj)
316
317
        def extend(self, iterable):
318
            """extending %s is deprecated""" % (variable_name,)
319
            return self._warn_deprecated(list.extend, iterable)
320
321
        def remove(self, value):
322
            """removing from %s is deprecated""" % (variable_name,)
323
            return self._warn_deprecated(list.remove, value)
324
325
        def pop(self, index=None):
326
            """pop'ing from from %s is deprecated""" % (variable_name,)
327
            if index:
328
                return self._warn_deprecated(list.pop, index)
329
            else:
330
                # Can't pass None
331
                return self._warn_deprecated(list.pop)
332
333
    return _DeprecatedList(initial_value)
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
334
335
3427.5.5 by John Arbash Meinel
Disable suppression if there is already a filter present for Warnings
336
def _check_for_filter(error_only):
337
    """Check if there is already a filter for deprecation warnings.
338
    
339
    :param error_only: Only match an 'error' filter
340
    :return: True if a filter is found, False otherwise
341
    """
342
    import warnings
343
    for filter in warnings.filters:
344
        if issubclass(DeprecationWarning, filter[2]):
345
            # This filter will effect DeprecationWarning
346
            if not error_only or filter[0] == 'error':
347
                return True
348
    return False
349
350
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
351
def suppress_deprecation_warnings(override=True):
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
352
    """Call this function to suppress all deprecation warnings.
353
354
    When this is a final release version, we don't want to annoy users with
355
    lots of deprecation warnings. We only want the deprecation warnings when
356
    running a dev or release candidate.
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
357
358
    :param override: If True, always set the ignore, if False, only set the
359
        ignore if there isn't already a filter.
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
360
    """
361
    import warnings
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
362
    if not override and _check_for_filter(error_only=False):
3427.5.5 by John Arbash Meinel
Disable suppression if there is already a filter present for Warnings
363
        # If there is already a filter effecting suppress_deprecation_warnings,
364
        # then skip it.
365
        return
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
366
    warnings.filterwarnings('ignore', category=DeprecationWarning)
367
368
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
369
def activate_deprecation_warnings(override=True):
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
370
    """Call this function to activate deprecation warnings.
371
372
    When running in a 'final' release we suppress deprecation warnings.
373
    However, the test suite wants to see them. So when running selftest, we
374
    re-enable the deprecation warnings.
375
376
    Note: warnings that have already been issued under 'ignore' will not be
377
    reported after this point. The 'warnings' module has already marked them as
378
    handled, so they don't get issued again.
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
379
380
    :param override: If False, only add a filter if there isn't an error filter
381
        already. (This slightly differs from suppress_deprecation_warnings, in
382
        because it always overrides everything but -Werror).
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
383
    """
384
    import warnings
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
385
    if not override and _check_for_filter(error_only=True):
3427.5.5 by John Arbash Meinel
Disable suppression if there is already a filter present for Warnings
386
        # DeprecationWarnings are already turned into errors, don't downgrade
387
        # them to 'default'.
388
        return
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
389
    warnings.filterwarnings('default', category=DeprecationWarning)