~bzr-pqm/bzr/bzr.dev

5273.1.9 by Vincent Ladeuil
Merge bzr.dev into cleanup resolving conflicts
1
# Copyright (C) 2006-2010 Canonical Ltd
1534.2.1 by Robert Collins
Implement deprecated_method
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1534.2.1 by Robert Collins
Implement deprecated_method
16
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
17
from __future__ import absolute_import
18
1534.2.1 by Robert Collins
Implement deprecated_method
19
"""Symbol versioning
20
21
The methods here allow for api symbol versioning.
22
"""
23
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
24
__all__ = ['deprecated_function',
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
25
           '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.
26
           'deprecated_list',
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
27
           'deprecated_method',
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
28
           'DEPRECATED_PARAMETER',
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
29
           'deprecated_passed',
3400.3.1 by Martin Pool
Remove methods deprecated in zero_eight
30
           'set_warning_method',
31
           'warn',
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
32
           ]
1534.2.1 by Robert Collins
Implement deprecated_method
33
5393.2.1 by Vincent Ladeuil
Fix bug #625686 by removing the warning filter added by selftest.
34
35
import warnings
36
# Import the 'warn' symbol so bzrlib can call it even if we redefine it
1534.2.1 by Robert Collins
Implement deprecated_method
37
from warnings import warn
38
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
39
import bzrlib
40
1534.2.1 by Robert Collins
Implement deprecated_method
41
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
42
DEPRECATED_PARAMETER = "A deprecated parameter marker."
1534.2.1 by Robert Collins
Implement deprecated_method
43
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
44
45
def deprecated_in(version_tuple):
46
    """Generate a message that something was deprecated in a release.
47
48
    >>> deprecated_in((1, 4, 0))
4634.50.8 by John Arbash Meinel
it seems there was even a symbol_versioning doctest that I missed.
49
    '%s was deprecated in version 1.4.0.'
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
50
    """
3427.2.5 by John Arbash Meinel
Change deprecated_in to end with a '.'
51
    return ("%%s was deprecated in version %s."
52
            % bzrlib._format_version_tuple(version_tuple))
3388.1.2 by Martin Pool
Add new symbol_versioning.deprecated_in
53
1534.2.1 by Robert Collins
Implement deprecated_method
54
55
def set_warning_method(method):
56
    """Set the warning method to be used by this module.
57
58
    It should take a message and a warning category as warnings.warn does.
59
    """
60
    global warn
61
    warn = method
62
63
1534.2.2 by Robert Collins
Implement deprecated_function.
64
# TODO - maybe this would be easier to use as one 'smart' method that
65
# guess if it is a method or a class or an attribute ? If so, we can
66
# add that on top of the primitives, once we have all three written
67
# - RBC 20050105
68
1982.3.1 by Robert Collins
New utility function symbol_versioning.deprecation_string. Returns the
69
70
def deprecation_string(a_callable, deprecation_version):
71
    """Generate an automatic deprecation string for a_callable.
72
73
    :param a_callable: The callable to substitute into deprecation_version.
74
    :param deprecation_version: A deprecation format warning string. This should
75
        have a single %s operator in it. a_callable will be turned into a nice
76
        python symbol and then substituted into deprecation_version.
77
    """
2872.5.1 by Martin Pool
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).
78
    # We also want to handle old-style classes, in particular exception, and
79
    # they don't have an im_class attribute.
1982.3.1 by Robert Collins
New utility function symbol_versioning.deprecation_string. Returns the
80
    if getattr(a_callable, 'im_class', None) is None:
81
        symbol = "%s.%s" % (a_callable.__module__,
82
                            a_callable.__name__)
83
    else:
84
        symbol = "%s.%s.%s" % (a_callable.im_class.__module__,
85
                               a_callable.im_class.__name__,
86
                               a_callable.__name__
87
                               )
88
    return deprecation_version % symbol
89
90
1534.2.2 by Robert Collins
Implement deprecated_function.
91
def deprecated_function(deprecation_version):
92
    """Decorate a function so that use of it will trigger a warning."""
93
94
    def function_decorator(callable):
95
        """This is the function python calls to perform the decoration."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
96
1534.2.2 by Robert Collins
Implement deprecated_function.
97
        def decorated_function(*args, **kwargs):
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
98
            """This is the decorated function."""
3530.2.2 by John Arbash Meinel
Add extra debugging for when a deprecated function/method are called
99
            from bzrlib import trace
100
            trace.mutter_callsite(4, "Deprecated function called")
1982.3.1 by Robert Collins
New utility function symbol_versioning.deprecation_string. Returns the
101
            warn(deprecation_string(callable, deprecation_version),
102
                DeprecationWarning, stacklevel=2)
1534.2.2 by Robert Collins
Implement deprecated_function.
103
            return callable(*args, **kwargs)
1534.2.5 by Robert Collins
Set the __name__ attribute on decorated methods and functions.
104
        _populate_decorated(callable, deprecation_version, "function",
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
105
                            decorated_function)
1534.2.2 by Robert Collins
Implement deprecated_function.
106
        return decorated_function
107
    return function_decorator
108
109
1534.2.1 by Robert Collins
Implement deprecated_method
110
def deprecated_method(deprecation_version):
111
    """Decorate a method so that use of it will trigger a warning.
2825.3.2 by Martin Pool
doc
112
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
113
    To deprecate a static or class method, use
2825.3.2 by Martin Pool
doc
114
115
        @staticmethod
116
        @deprecated_function
117
        def ...
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
118
1534.2.1 by Robert Collins
Implement deprecated_method
119
    To deprecate an entire class, decorate __init__.
120
    """
121
122
    def method_decorator(callable):
123
        """This is the function python calls to perform the decoration."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
124
1534.2.1 by Robert Collins
Implement deprecated_method
125
        def decorated_method(self, *args, **kwargs):
126
            """This is the decorated method."""
3530.2.2 by John Arbash Meinel
Add extra debugging for when a deprecated function/method are called
127
            from bzrlib import trace
2872.5.1 by Martin Pool
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).
128
            if callable.__name__ == '__init__':
129
                symbol = "%s.%s" % (self.__class__.__module__,
130
                                    self.__class__.__name__,
131
                                    )
132
            else:
133
                symbol = "%s.%s.%s" % (self.__class__.__module__,
134
                                       self.__class__.__name__,
135
                                       callable.__name__
136
                                       )
3530.2.2 by John Arbash Meinel
Add extra debugging for when a deprecated function/method are called
137
            trace.mutter_callsite(4, "Deprecated method called")
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
138
            warn(deprecation_version % symbol, DeprecationWarning, stacklevel=2)
1534.2.1 by Robert Collins
Implement deprecated_method
139
            return callable(self, *args, **kwargs)
1534.2.5 by Robert Collins
Set the __name__ attribute on decorated methods and functions.
140
        _populate_decorated(callable, deprecation_version, "method",
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
141
                            decorated_method)
1534.2.1 by Robert Collins
Implement deprecated_method
142
        return decorated_method
143
    return method_decorator
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
144
145
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
146
def deprecated_passed(parameter_value):
147
    """Return True if parameter_value was used."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
148
    # FIXME: it might be nice to have a parameter deprecation decorator.
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
149
    # it would need to handle positional and *args and **kwargs parameters,
150
    # which means some mechanism to describe how the parameter was being
151
    # passed before deprecation, and some way to deprecate parameters that
152
    # were not at the end of the arg list. Thats needed for __init__ where
153
    # we cannot just forward to a new method name.I.e. in the following
154
    # examples we would want to have callers that pass any value to 'bad' be
155
    # given a warning - because we have applied:
3400.3.4 by Martin Pool
Remove zero_seven deprecations
156
    # @deprecated_parameter('bad', deprecated_in((1, 5, 0))
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
157
    #
158
    # def __init__(self, bad=None)
159
    # def __init__(self, bad, other)
160
    # def __init__(self, **kwargs)
161
    # RBC 20060116
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
162
    return not parameter_value is DEPRECATED_PARAMETER
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
163
164
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
165
def _decorate_docstring(callable, deprecation_version, label,
166
                        decorated_callable):
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
167
    if callable.__doc__:
168
        docstring_lines = callable.__doc__.split('\n')
169
    else:
170
        docstring_lines = []
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
171
    if len(docstring_lines) == 0:
172
        decorated_callable.__doc__ = deprecation_version % ("This " + label)
173
    elif len(docstring_lines) == 1:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
174
        decorated_callable.__doc__ = (callable.__doc__
1534.2.3 by Robert Collins
decorate docstrings in deprecated functions.
175
                                    + "\n"
176
                                    + "\n"
177
                                    + deprecation_version % ("This " + label)
178
                                    + "\n")
179
    else:
180
        spaces = len(docstring_lines[-1])
181
        new_doc = callable.__doc__
182
        new_doc += "\n" + " " * spaces
183
        new_doc += deprecation_version % ("This " + label)
184
        new_doc += "\n" + " " * spaces
185
        decorated_callable.__doc__ = new_doc
1534.2.5 by Robert Collins
Set the __name__ attribute on decorated methods and functions.
186
187
188
def _populate_decorated(callable, deprecation_version, label,
189
                        decorated_callable):
190
    """Populate attributes like __name__ and __doc__ on the decorated callable.
191
    """
192
    _decorate_docstring(callable, deprecation_version, label,
193
                        decorated_callable)
1534.1.3 by Robert Collins
Bugfix the symbol_versioning deprecation decorators to update the
194
    decorated_callable.__module__ = callable.__module__
1534.2.5 by Robert Collins
Set the __name__ attribute on decorated methods and functions.
195
    decorated_callable.__name__ = callable.__name__
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
196
    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.
197
198
2227.1.5 by mbp at sourcefrog
doc cleanup
199
def _dict_deprecation_wrapper(wrapped_method):
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
200
    """Returns a closure that emits a warning and calls the superclass"""
201
    def cb(dep_dict, *args, **kwargs):
202
        msg = 'access to %s' % (dep_dict._variable_name, )
203
        msg = dep_dict._deprecation_version % (msg,)
204
        if dep_dict._advice:
205
            msg += ' ' + dep_dict._advice
206
        warn(msg, DeprecationWarning, stacklevel=2)
2227.1.5 by mbp at sourcefrog
doc cleanup
207
        return wrapped_method(dep_dict, *args, **kwargs)
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
208
    return cb
209
210
211
class DeprecatedDict(dict):
212
    """A dictionary that complains when read or written."""
213
214
    is_deprecated = True
215
216
    def __init__(self,
217
        deprecation_version,
218
        variable_name,
219
        initial_value,
220
        advice,
221
        ):
222
        """Create a dict that warns when read or modified.
223
3400.3.5 by Martin Pool
Remove zero_nine deprecations
224
        :param deprecation_version: string for the warning format to raise,
225
            typically from deprecated_in()
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
226
        :param initial_value: The contents of the dict
227
        :param variable_name: This allows better warnings to be printed
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
228
        :param advice: String of advice on what callers should do instead
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
229
            of using this variable.
230
        """
231
        self._deprecation_version = deprecation_version
232
        self._variable_name = variable_name
233
        self._advice = advice
234
        dict.__init__(self, initial_value)
235
236
    # This isn't every possible method but it should trap anyone using the
237
    # dict -- add more if desired
238
    __len__ = _dict_deprecation_wrapper(dict.__len__)
239
    __getitem__ = _dict_deprecation_wrapper(dict.__getitem__)
240
    __setitem__ = _dict_deprecation_wrapper(dict.__setitem__)
241
    __delitem__ = _dict_deprecation_wrapper(dict.__delitem__)
242
    keys = _dict_deprecation_wrapper(dict.keys)
243
    __contains__ = _dict_deprecation_wrapper(dict.__contains__)
244
245
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.
246
def deprecated_list(deprecation_version, variable_name,
247
                    initial_value, extra=None):
248
    """Create a list that warns when modified
249
3400.3.5 by Martin Pool
Remove zero_nine deprecations
250
    :param deprecation_version: string for the warning format to raise,
251
        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.
252
    :param initial_value: The contents of the list
253
    :param variable_name: This allows better warnings to be printed
254
    :param extra: Extra info to print when printing a warning
255
    """
256
257
    subst_text = 'Modifying %s' % (variable_name,)
258
    msg = deprecation_version % (subst_text,)
259
    if extra:
260
        msg += ' ' + extra
261
262
    class _DeprecatedList(list):
263
        __doc__ = list.__doc__ + msg
264
265
        is_deprecated = True
266
267
        def _warn_deprecated(self, func, *args, **kwargs):
268
            warn(msg, DeprecationWarning, stacklevel=3)
269
            return func(self, *args, **kwargs)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
270
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.
271
        def append(self, obj):
272
            """appending to %s is deprecated""" % (variable_name,)
273
            return self._warn_deprecated(list.append, obj)
274
275
        def insert(self, index, obj):
276
            """inserting to %s is deprecated""" % (variable_name,)
277
            return self._warn_deprecated(list.insert, index, obj)
278
279
        def extend(self, iterable):
280
            """extending %s is deprecated""" % (variable_name,)
281
            return self._warn_deprecated(list.extend, iterable)
282
283
        def remove(self, value):
284
            """removing from %s is deprecated""" % (variable_name,)
285
            return self._warn_deprecated(list.remove, value)
286
287
        def pop(self, index=None):
4031.3.1 by Frank Aspell
Fixing various typos
288
            """pop'ing from %s is deprecated""" % (variable_name,)
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.
289
            if index:
290
                return self._warn_deprecated(list.pop, index)
291
            else:
292
                # Can't pass None
293
                return self._warn_deprecated(list.pop)
294
295
    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.
296
297
3427.5.5 by John Arbash Meinel
Disable suppression if there is already a filter present for Warnings
298
def _check_for_filter(error_only):
299
    """Check if there is already a filter for deprecation warnings.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
300
3427.5.5 by John Arbash Meinel
Disable suppression if there is already a filter present for Warnings
301
    :param error_only: Only match an 'error' filter
302
    :return: True if a filter is found, False otherwise
303
    """
304
    for filter in warnings.filters:
305
        if issubclass(DeprecationWarning, filter[2]):
306
            # This filter will effect DeprecationWarning
307
            if not error_only or filter[0] == 'error':
308
                return True
309
    return False
310
311
5393.2.1 by Vincent Ladeuil
Fix bug #625686 by removing the warning filter added by selftest.
312
def _remove_filter_callable(filter):
313
    """Build and returns a callable removing filter from the warnings.
314
315
    :param filter: The filter to remove (can be None).
316
317
    :return: A callable that will remove filter from warnings.filters.
318
    """
319
    def cleanup():
320
        if filter:
321
            warnings.filters.remove(filter)
322
    return cleanup
323
324
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
325
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.
326
    """Call this function to suppress all deprecation warnings.
327
328
    When this is a final release version, we don't want to annoy users with
329
    lots of deprecation warnings. We only want the deprecation warnings when
330
    running a dev or release candidate.
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
331
332
    :param override: If True, always set the ignore, if False, only set the
333
        ignore if there isn't already a filter.
5393.2.1 by Vincent Ladeuil
Fix bug #625686 by removing the warning filter added by selftest.
334
5320.2.1 by Robert Collins
The symbol_versioning module can now cleanup after itself -
335
    :return: A callable to remove the new warnings this added.
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
336
    """
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
337
    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
338
        # If there is already a filter effecting suppress_deprecation_warnings,
339
        # then skip it.
5393.2.1 by Vincent Ladeuil
Fix bug #625686 by removing the warning filter added by selftest.
340
        filter = None
341
    else:
342
        warnings.filterwarnings('ignore', category=DeprecationWarning)
343
        filter = warnings.filters[0]
344
    return _remove_filter_callable(filter)
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
345
346
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
347
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.
348
    """Call this function to activate deprecation warnings.
349
350
    When running in a 'final' release we suppress deprecation warnings.
351
    However, the test suite wants to see them. So when running selftest, we
352
    re-enable the deprecation warnings.
353
354
    Note: warnings that have already been issued under 'ignore' will not be
355
    reported after this point. The 'warnings' module has already marked them as
356
    handled, so they don't get issued again.
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
357
358
    :param override: If False, only add a filter if there isn't an error filter
359
        already. (This slightly differs from suppress_deprecation_warnings, in
360
        because it always overrides everything but -Werror).
5393.2.1 by Vincent Ladeuil
Fix bug #625686 by removing the warning filter added by selftest.
361
362
    :return: A callable to remove the new warnings this added.
3427.5.1 by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release.
363
    """
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
364
    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
365
        # DeprecationWarnings are already turned into errors, don't downgrade
366
        # them to 'default'.
5393.2.1 by Vincent Ladeuil
Fix bug #625686 by removing the warning filter added by selftest.
367
        filter = None
368
    else:
369
        warnings.filterwarnings('default', category=DeprecationWarning)
370
        filter = warnings.filters[0]
371
    return _remove_filter_callable(filter)