~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/symbol_versioning.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
41
41
    """Generate a message that something was deprecated in a release.
42
42
 
43
43
    >>> deprecated_in((1, 4, 0))
44
 
    '%s was deprecated in version 1.4.'
 
44
    '%s was deprecated in version 1.4.0.'
45
45
    """
46
46
    return ("%%s was deprecated in version %s."
47
47
            % bzrlib._format_version_tuple(version_tuple))
280
280
            return self._warn_deprecated(list.remove, value)
281
281
 
282
282
        def pop(self, index=None):
283
 
            """pop'ing from from %s is deprecated""" % (variable_name,)
 
283
            """pop'ing from %s is deprecated""" % (variable_name,)
284
284
            if index:
285
285
                return self._warn_deprecated(list.pop, index)
286
286
            else: