Merge lp:~jelmer/brz/deprecation into lp:brz

[Jelmer Vernooij]

Remove all deprecated arguments, functions and methods.

Remove all deprecated arguments, functions and methods.

[Martin Packman (gz)]

Approve per earlier review.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
http://10.242.247.184:8080/job/brz-dev/16/

[lp:~jelmer/brz/deprecation]

6639. By Jelmer Vernooij on 2017-05-30

Remove all deprecated arguments, functions and methods.

Merged from https://code.launchpad.net/~jelmer/brz/deprecation/+merge/324814

=== modified file 'breezy/atomicfile.py'
--- breezy/atomicfile.py	2017-05-22 00:56:52 +0000
+++ breezy/atomicfile.py	2017-05-30 21:16:02 +0000
@@ -26,7 +26,6 @@
 from breezy import (
     errors,
     osutils,
-    symbol_versioning,
     )
 """)
 
 
=== modified file 'breezy/branch.py'
--- breezy/branch.py	2017-05-25 01:35:55 +0000
+++ breezy/branch.py	2017-05-30 21:16:02 +0000
@@ -67,10 +67,6 @@
 from .sixish import (
     BytesIO,
     )
-from .symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 from .trace import mutter, mutter_callsite, note, is_quiet
 
 
@@ -759,19 +755,6 @@
         """
         return None
 
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def get_revision_delta(self, revno):
-        """Return the delta for one revision.
-
-        The delta is relative to its mainline predecessor, or the
-        empty tree for revision 1.
-        """
-        try:
-            revid = self.get_rev_id(revno)
-        except errors.NoSuchRevision:
-            raise errors.InvalidRevisionNumber(revno)
-        return self.repository.get_revision_delta(revid)
-
     def get_stacked_on_url(self):
         """Get the URL this branch is stacked against.
 
 
=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-05-25 01:35:55 +0000
+++ breezy/builtins.py	2017-05-30 21:16:02 +0000
@@ -33,6 +33,7 @@
     bugtracker,
     bundle,
     btree_index,
+    cache_utf8,
     controldir,
     directory_service,
     delta,
@@ -48,6 +49,7 @@
     rename_map,
     revision as _mod_revision,
     static_tuple,
+    symbol_versioning,
     timestamp,
     transport,
     ui,
@@ -81,9 +83,6 @@
     text_type,
 )
 from .trace import mutter, note, warning, is_quiet, get_verbosity_level
-from . import (
-    symbol_versioning,
-    )
 
 
 def _get_branch_location(control_dir, possible_transports=None):
@@ -458,7 +457,7 @@
         try:
             # TODO: jam 20060112 should cat-revision always output utf-8?
             if revision_id is not None:
-                revision_id = osutils.safe_revision_id(revision_id, warn=False)
+                revision_id = cache_utf8.encode(revision_id)
                 try:
                     self.print_revision(revisions, revision_id)
                 except errors.NoSuchRevision:
@@ -1444,7 +1443,6 @@
             use_existing_dir=False, switch=False, bind=False,
             files_from=None):
         from breezy import switch as _mod_switch
-        from .tag import _merge_tags_if_possible
         if self.invoked_as in ['get', 'clone']:
             ui.ui_factory.show_user_warning(
                 'deprecated_command',
@@ -1523,7 +1521,8 @@
                 to_repo = to_dir.create_repository()
             to_repo.fetch(br_from.repository, revision_id=revision_id)
             branch = br_from.sprout(to_dir, revision_id=revision_id)
-        _merge_tags_if_possible(br_from, branch)
+        br_from.tags.merge_to(branch.tags)
+
         # If the source branch is stacked, the new branch may
         # be stacked whether we asked for that explicitly or not.
         # We therefore need a try/except here and not just 'if stacked:'
@@ -2744,7 +2743,6 @@
             match_author=None,
             match_bugs=None,
             omit_merges=False,
-            include_merges=symbol_versioning.DEPRECATED_PARAMETER,
             ):
         from .log import (
             Logger,
@@ -2752,19 +2750,6 @@
             _get_info_for_log_files,
             )
         direction = (forward and 'forward') or 'reverse'
-        if symbol_versioning.deprecated_passed(include_merges):
-            ui.ui_factory.show_user_warning(
-                'deprecated_command_option',
-                deprecated_name='--include-merges',
-                recommended_name='--include-merged',
-                deprecated_in_version='2.5',
-                command=self.invoked_as)
-            if include_merged is None:
-                include_merged = include_merges
-            else:
-                raise errors.BzrCommandError(gettext(
-                    '{0} and {1} are mutually exclusive').format(
-                    '--include-merges', '--include-merged'))
         if include_merged is None:
             include_merged = False
         if (exclude_common_ancestry
@@ -4540,7 +4525,6 @@
     def _get_merger_from_branch(self, tree, location, revision, remember,
                                 possible_transports, pb):
         """Produce a merger from a location, assuming it refers to a branch."""
-        from .tag import _merge_tags_if_possible
         # find the branch locations
         other_loc, user_location = self._select_branch_location(tree, location,
             revision, -1)
@@ -4580,7 +4564,7 @@
             tree.branch.set_submit_branch(other_branch.base)
         # Merge tags (but don't set them in the master branch yet, the user
         # might revert this merge).  Commit will propagate them.
-        _merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
+        other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
         merger = _mod_merge.Merger.from_revision_ids(pb, tree,
             other_revision_id, base_revision_id, other_branch, base_branch)
         if other_path != '':
@@ -4939,26 +4923,12 @@
             log_format=None, long=False, short=False, line=False,
             show_ids=False, verbose=False, this=False, other=False,
             include_merged=None, revision=None, my_revision=None,
-            directory=u'.',
-            include_merges=symbol_versioning.DEPRECATED_PARAMETER):
+            directory=u'.'):
         from breezy.missing import find_unmerged, iter_log_revisions
         def message(s):
             if not is_quiet():
                 self.outf.write(s)
 
-        if symbol_versioning.deprecated_passed(include_merges):
-            ui.ui_factory.show_user_warning(
-                'deprecated_command_option',
-                deprecated_name='--include-merges',
-                recommended_name='--include-merged',
-                deprecated_in_version='2.5',
-                command=self.invoked_as)
-            if include_merged is None:
-                include_merged = include_merges
-            else:
-                raise errors.BzrCommandError(gettext(
-                    '{0} and {1} are mutually exclusive').format(
-                    '--include-merges', '--include-merged'))
         if include_merged is None:
             include_merged = False
         if this:
 
=== modified file 'breezy/bundle/bundle_data.py'
--- breezy/bundle/bundle_data.py	2017-05-25 01:35:55 +0000
+++ breezy/bundle/bundle_data.py	2017-05-30 21:16:02 +0000
@@ -23,6 +23,7 @@
 import pprint
 
 from .. import (
+    cache_utf8,
     osutils,
     timestamp,
     )
@@ -323,8 +324,7 @@
             if last_changed is not None:
                 # last_changed will be a Unicode string because of how it was
                 # read. Convert it back to utf8.
-                changed_revision_id = osutils.safe_revision_id(last_changed,
-                                                               warn=False)
+                changed_revision_id = cache_utf8.encode(last_changed)
             else:
                 changed_revision_id = revision_id
             bundle_tree.note_last_changed(path, changed_revision_id)
@@ -399,7 +399,7 @@
                         ': %r' % extra)
             # This will be Unicode because of how the stream is read. Turn it
             # back into a utf8 file_id
-            file_id = osutils.safe_file_id(info[1][8:], warn=False)
+            file_id = cache_utf8.encode(info[1][8:])
 
             bundle_tree.note_id(file_id, path, kind)
             # this will be overridden in extra_info if executable is specified.
 
=== modified file 'breezy/bzrdir.py'
--- breezy/bzrdir.py	2017-05-22 00:56:52 +0000
+++ breezy/bzrdir.py	2017-05-30 21:16:02 +0000
@@ -72,10 +72,6 @@
     controldir,
     registry,
     )
-from .symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 
 
 class BzrDir(controldir.ControlDir):
 
=== modified file 'breezy/commit.py'
--- breezy/commit.py	2017-05-22 00:56:52 +0000
+++ breezy/commit.py	2017-05-30 21:16:02 +0000
@@ -71,7 +71,6 @@
                       )
 from .trace import mutter, note, is_quiet
 from .inventory import Inventory, InventoryEntry, make_entry
-from . import symbol_versioning
 from .urlutils import unescape_for_display
 from .i18n import gettext
 
@@ -79,11 +78,7 @@
 class NullCommitReporter(object):
     """I report on progress of a commit."""
 
-    def started(self, revno, revid, location=None):
-        if location is None:
-            symbol_versioning.warn("As of bzr 1.0 you must pass a location "
-                                   "to started.", DeprecationWarning,
-                                   stacklevel=2)
+    def started(self, revno, revid, location):
         pass
 
     def snapshot_change(self, change, path):
@@ -119,17 +114,10 @@
             return
         self._note("%s %s", change, path)
 
-    def started(self, revno, rev_id, location=None):
-        if location is not None:
-            location = ' to: ' + unescape_for_display(location, 'utf-8')
-        else:
-            # When started was added, location was only made optional by
-            # accident.  Matt Nordhoff 20071129
-            symbol_versioning.warn("As of bzr 1.0 you must pass a location "
-                                   "to started.", DeprecationWarning,
-                                   stacklevel=2)
-            location = ''
-        self._note(gettext('Committing%s'), location)
+    def started(self, revno, rev_id, location):
+        self._note(
+            gettext('Committing to: %s'),
+            unescape_for_display(location, 'utf-8'))
 
     def completed(self, revno, rev_id):
         self._note(gettext('Committed revision %d.'), revno)
@@ -176,7 +164,7 @@
         self.config_stack = config_stack
 
     @staticmethod
-    def update_revprops(revprops, branch, authors=None, author=None,
+    def update_revprops(revprops, branch, authors=None,
                         local=False, possible_master_transports=None):
         if revprops is None:
             revprops = {}
@@ -187,9 +175,6 @@
                 local,
                 possible_master_transports)
         if authors is not None:
-            if author is not None:
-                raise AssertionError('Specifying both author and authors '
-                        'is not allowed. Specify just authors instead')
             if 'author' in revprops or 'authors' in revprops:
                 # XXX: maybe we should just accept one of them?
                 raise AssertionError('author property given twice')
@@ -199,17 +184,6 @@
                         raise AssertionError('\\n is not a valid character '
                                 'in an author identity')
                 revprops['authors'] = '\n'.join(authors)
-        if author is not None:
-            symbol_versioning.warn('The parameter author was deprecated'
-                   ' in version 1.13. Use authors instead',
-                   DeprecationWarning)
-            if 'author' in revprops or 'authors' in revprops:
-                # XXX: maybe we should just accept one of them?
-                raise AssertionError('author property given twice')
-            if '\n' in author:
-                raise AssertionError('\\n is not a valid character '
-                        'in an author identity')
-            revprops['authors'] = author
         return revprops
 
     def commit(self,
 
=== modified file 'breezy/config.py'
--- breezy/config.py	2017-05-25 01:35:55 +0000
+++ breezy/config.py	2017-05-30 21:16:02 +0000
@@ -97,7 +97,6 @@
     lockdir,
     mergetools,
     osutils,
-    symbol_versioning,
     trace,
     transport,
     ui,
@@ -118,10 +117,6 @@
     text_type,
     string_types,
     )
-from .symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 
 
 CHECK_IF_POSSIBLE=0
@@ -445,65 +440,6 @@
             l = [l]
         return l
 
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def get_user_option_as_int_from_SI(self, option_name, default=None):
-        """Get a generic option from a human readable size in SI units, e.g 10MB
-
-        Accepted suffixes are K,M,G. It is case-insensitive and may be followed
-        by a trailing b (i.e. Kb, MB). This is intended to be practical and not
-        pedantic.
-
-        :return Integer, expanded to its base-10 value if a proper SI unit is 
-            found. If the option doesn't exist, or isn't a value in 
-            SI units, return default (which defaults to None)
-        """
-        val = self.get_user_option(option_name)
-        if isinstance(val, list):
-            val = val[0]
-        if val is None:
-            val = default
-        else:
-            p = re.compile("^(\d+)([kmg])*b*$", re.IGNORECASE)
-            try:
-                m = p.match(val)
-                if m is not None:
-                    val = int(m.group(1))
-                    if m.group(2) is not None:
-                        if m.group(2).lower() == 'k':
-                            val *= 10**3
-                        elif m.group(2).lower() == 'm':
-                            val *= 10**6
-                        elif m.group(2).lower() == 'g':
-                            val *= 10**9
-                else:
-                    ui.ui_factory.show_warning(gettext('Invalid config value for "{0}" '
-                                               ' value {1!r} is not an SI unit.').format(
-                                                option_name, val))
-                    val = default
-            except TypeError:
-                val = default
-        return val
-
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def gpg_signing_command(self):
-        """What program should be used to sign signatures?"""
-        result = self._gpg_signing_command()
-        if result is None:
-            result = "gpg"
-        return result
-
-    def _gpg_signing_command(self):
-        """See gpg_signing_command()."""
-        return None
-
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def log_format(self):
-        """What log format should be used"""
-        result = self._log_format()
-        if result is None:
-            result = "long"
-        return result
-
     def _log_format(self):
         """See log_format()."""
         return None
@@ -521,25 +457,6 @@
         """See validate_signatures_in_log()."""
         return None
 
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def acceptable_keys(self):
-        """Comma separated list of key patterns acceptable to 
-        verify-signatures command"""
-        result = self._acceptable_keys()
-        return result
-
-    def _acceptable_keys(self):
-        """See acceptable_keys()."""
-        return None
-
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def post_commit(self):
-        """An ordered list of python functions to call.
-
-        Each function takes branch, rev_id as parameters.
-        """
-        return self._post_commit()
-
     def _post_commit(self):
         """See Config.post_commit."""
         return None
@@ -573,46 +490,6 @@
         """
         self.username()
 
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def signature_checking(self):
-        """What is the current policy for signature checking?."""
-        policy = self._get_signature_checking()
-        if policy is not None:
-            return policy
-        return CHECK_IF_POSSIBLE
-
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def signing_policy(self):
-        """What is the current policy for signature checking?."""
-        policy = self._get_signing_policy()
-        if policy is not None:
-            return policy
-        return SIGN_WHEN_REQUIRED
-
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def signature_needed(self):
-        """Is a signature needed when committing ?."""
-        policy = self._get_signing_policy()
-        if policy is None:
-            policy = self._get_signature_checking()
-            if policy is not None:
-                #this warning should go away once check_signatures is
-                #implemented (if not before)
-                trace.warning("Please use create_signatures,"
-                              " not check_signatures to set signing policy.")
-        elif policy == SIGN_ALWAYS:
-            return True
-        return False
-
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def gpg_signing_key(self):
-        """GPG user-id to sign commits"""
-        key = self.get_user_option('gpg_signing_key')
-        if key == "default" or key == None:
-            return self.user_email()
-        else:
-            return key
-
     def get_alias(self, value):
         return self._get_alias(value)
 
@@ -740,24 +617,14 @@
 class IniBasedConfig(Config):
     """A configuration policy that draws from ini files."""
 
-    def __init__(self, get_filename=symbol_versioning.DEPRECATED_PARAMETER,
-                 file_name=None):
+    def __init__(self, file_name=None):
         """Base class for configuration files using an ini-like syntax.
 
         :param file_name: The configuration file path.
         """
         super(IniBasedConfig, self).__init__()
         self.file_name = file_name
-        if symbol_versioning.deprecated_passed(get_filename):
-            symbol_versioning.warn(
-                'IniBasedConfig.__init__(get_filename) was deprecated in 2.3.'
-                ' Use file_name instead.',
-                DeprecationWarning,
-                stacklevel=2)
-            if get_filename is not None:
-                self.file_name = get_filename()
-        else:
-            self.file_name = file_name
+        self.file_name = file_name
         self._content = None
         self._parser = None
 
@@ -783,15 +650,9 @@
         if save:
             self._write_config_file()
 
-    def _get_parser(self, file=symbol_versioning.DEPRECATED_PARAMETER):
+    def _get_parser(self):
         if self._parser is not None:
             return self._parser
-        if symbol_versioning.deprecated_passed(file):
-            symbol_versioning.warn(
-                'IniBasedConfig._get_parser(file=xxx) was deprecated in 2.3.'
-                ' Use IniBasedConfig(_content=xxx) instead.',
-                DeprecationWarning,
-                stacklevel=2)
         if self._content is not None:
             co_input = self._content
         elif self.file_name is None:
@@ -1277,26 +1138,6 @@
 
     def _set_option_policy(self, section, option_name, option_policy):
         """Set the policy for the given option name in the given section."""
-        # The old recurse=False option affects all options in the
-        # section.  To handle multiple policies in the section, we
-        # need to convert it to a policy_norecurse key.
-        try:
-            recurse = self._get_parser()[section].as_bool('recurse')
-        except KeyError:
-            pass
-        else:
-            symbol_versioning.warn(
-                'The recurse option is deprecated as of 0.14.  '
-                'The section "%s" has been converted to use policies.'
-                % section,
-                DeprecationWarning)
-            del self._get_parser()[section]['recurse']
-            if not recurse:
-                for key in self._get_parser()[section].keys():
-                    if not key.endswith(':policy'):
-                        self._get_parser()[section][key +
-                                                    ':policy'] = 'norecurse'
-
         policy_key = option_name + ':policy'
         policy_name = _policy_name[option_policy]
         if policy_name is not None:
 
=== modified file 'breezy/conflicts.py'
--- breezy/conflicts.py	2017-05-22 00:56:52 +0000
+++ breezy/conflicts.py	2017-05-30 21:16:02 +0000
@@ -37,6 +37,7 @@
 from breezy.i18n import gettext, ngettext
 """)
 from . import (
+    cache_utf8,
     commands,
     option,
     registry,
@@ -368,9 +369,11 @@
 
     def __init__(self, path, file_id=None):
         self.path = path
-        # warn turned off, because the factory blindly transfers the Stanza
-        # values to __init__ and Stanza is purely a Unicode api.
-        self.file_id = osutils.safe_file_id(file_id, warn=False)
+        # the factory blindly transfers the Stanza values to __init__ and
+        # Stanza is purely a Unicode api.
+        if isinstance(file_id, unicode):
+            file_id = cache_utf8.encode(file_id)
+        self.file_id = osutils.safe_file_id(file_id)
 
     def as_stanza(self):
         s = rio.Stanza(type=self.typestring, path=self.path)
@@ -711,10 +714,11 @@
                  conflict_file_id=None):
         HandledConflict.__init__(self, action, path, file_id)
         self.conflict_path = conflict_path
-        # warn turned off, because the factory blindly transfers the Stanza
-        # values to __init__.
-        self.conflict_file_id = osutils.safe_file_id(conflict_file_id,
-                                                     warn=False)
+        # the factory blindly transfers the Stanza values to __init__,
+        # so they can be unicode.
+        if isinstance(conflict_file_id, unicode):
+            conflict_file_id = cache_utf8.encode(conflict_file_id)
+        self.conflict_file_id = osutils.safe_file_id(conflict_file_id)
 
     def _cmp_list(self):
         return HandledConflict._cmp_list(self) + [self.conflict_path,
 
=== modified file 'breezy/filters/__init__.py'
--- breezy/filters/__init__.py	2017-05-22 00:56:52 +0000
+++ breezy/filters/__init__.py	2017-05-30 21:16:02 +0000
@@ -52,10 +52,6 @@
 from ..sixish import (
     BytesIO,
     )
-from ..symbol_versioning import (
-    deprecated_function,
-    deprecated_in,
-    )
 
 
 class ContentFilter(object):
@@ -190,33 +186,6 @@
 _stack_cache = {}
 
 
-# XXX: This function doesn't have any tests. JRV 2012-03-29
-@deprecated_function(deprecated_in((2, 6, 0)))
-def register_filter_stack_map(name, stack_map_lookup):
-    """Register the filter stacks to use for various preference values.
-
-    :param name: the preference/filter-stack name
-    :param stack_map_lookup: a callable where
-      the parameter is the preference value to match and
-      the result is the matching stack of filters to use,
-      or None if none.
-    """
-    filter_stacks_registry.register(name, stack_map_lookup)
-
-
-# XXX: This function doesn't have any tests. JRV 2012-03-29
-@deprecated_function(deprecated_in((2, 6, 0)))
-def lazy_register_filter_stack_map(name, module_name, member_name):
-    """Lazily register the filter stacks to use for various preference values.
-
-    :param name: the preference/filter-stack name
-    :param module_name: The python path to the module of the filter stack map.
-    :param member_name: The name of the stack_map_lookup callable
-      in the module.
-    """
-    filter_stacks_registry.register_lazy(name, module_name, member_name)
-
-
 def _get_registered_names():
     """Get the list of names with filters registered."""
     # Note: We may want to intelligently order these later.
 
=== modified file 'breezy/gpg.py'
--- breezy/gpg.py	2017-05-22 00:56:52 +0000
+++ breezy/gpg.py	2017-05-30 21:16:02 +0000
@@ -42,10 +42,6 @@
 from .sixish import (
     BytesIO,
     )
-from .symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 
 #verification results
 SIGNATURE_VALID = 0
@@ -144,30 +140,6 @@
                 else:
                     self.acceptable_keys.append(pattern)
 
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def do_verifications(self, revisions, repository):
-        return bulk_verify_signatures(repository, revisions, self)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def valid_commits_message(self, count):
-        return valid_commits_message(count)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def unknown_key_message(self, count):
-        return unknown_key_message(count)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def commit_not_valid_message(self, count):
-        return commit_not_valid_message(count)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def commit_not_signed_message(self, count):
-        return commit_not_signed_message(count)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def expired_commit_message(self, count):
-        return expired_commit_message(count)
-
 
 def _set_gpg_tty():
     tty = os.environ.get('TTY')
@@ -360,73 +332,6 @@
                             "No GnuPG key results for pattern: {0}"
                                 ).format(pattern))
 
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def do_verifications(self, revisions, repository,
-                            process_events_callback=None):
-        """do verifications on a set of revisions
-
-        :param revisions: list of revision ids to verify
-        :param repository: repository object
-        :param process_events_callback: method to call for GUI frontends that
-            want to keep their UI refreshed
-
-        :return: count dictionary of results of each type,
-                 result list for each revision,
-                 boolean True if all results are verified successfully
-        """
-        return bulk_verify_signatures(repository, revisions, self,
-            process_events_callback)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def verbose_valid_message(self, result):
-        """takes a verify result and returns list of signed commits strings"""
-        return verbose_valid_message(result)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def verbose_not_valid_message(self, result, repo):
-        """takes a verify result and returns list of not valid commit info"""
-        return verbose_not_valid_message(result, repo)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def verbose_not_signed_message(self, result, repo):
-        """takes a verify result and returns list of not signed commit info"""
-        return verbose_not_valid_message(result, repo)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def verbose_missing_key_message(self, result):
-        """takes a verify result and returns list of missing key info"""
-        return verbose_missing_key_message(result)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def verbose_expired_key_message(self, result, repo):
-        """takes a verify result and returns list of expired key info"""
-        return verbose_expired_key_message(result, repo)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def valid_commits_message(self, count):
-        """returns message for number of commits"""
-        return valid_commits_message(count)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def unknown_key_message(self, count):
-        """returns message for number of commits"""
-        return unknown_key_message(count)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def commit_not_valid_message(self, count):
-        """returns message for number of commits"""
-        return commit_not_valid_message(count)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def commit_not_signed_message(self, count):
-        """returns message for number of commits"""
-        return commit_not_signed_message(count)
-
-    @deprecated_method(deprecated_in((2, 6, 0)))
-    def expired_commit_message(self, count):
-        """returns message for number of commits"""
-        return expired_commit_message(count)
-
 
 def valid_commits_message(count):
     """returns message for number of commits"""
 
=== modified file 'breezy/hooks.py'
--- breezy/hooks.py	2017-05-22 00:56:52 +0000
+++ breezy/hooks.py	2017-05-30 21:16:02 +0000
@@ -20,7 +20,6 @@
 
 from . import (
     registry,
-    symbol_versioning,
     )
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 
=== modified file 'breezy/inventory.py'
--- breezy/inventory.py	2017-05-22 00:56:52 +0000
+++ breezy/inventory.py	2017-05-30 21:16:02 +0000
@@ -50,10 +50,6 @@
     )
 
 from .static_tuple import StaticTuple
-from .symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 
 
 class InventoryEntry(object):
 
=== modified file 'breezy/lru_cache.py'
--- breezy/lru_cache.py	2017-05-22 00:56:52 +0000
+++ breezy/lru_cache.py	2017-05-30 21:16:02 +0000
@@ -19,7 +19,6 @@
 from __future__ import absolute_import
 
 from . import (
-    symbol_versioning,
     trace,
     )
 
@@ -93,13 +92,6 @@
     def __len__(self):
         return len(self._cache)
 
-    @symbol_versioning.deprecated_method(
-        symbol_versioning.deprecated_in((2, 5, 0)))
-    def add(self, key, value, cleanup=None):
-        if cleanup is not None:
-            raise ValueError("Per-node cleanup functions no longer supported")
-        return self.__setitem__(key, value)
-
     def __setitem__(self, key, value):
         """Add a new value to the cache"""
         if key is _null_key:
@@ -143,9 +135,6 @@
         """Get a new dict with the same key:value pairs as the cache"""
         return dict((k, n.value) for k, n in self._cache.iteritems())
 
-    items = symbol_versioning.deprecated_method(
-        symbol_versioning.deprecated_in((2, 5, 0)))(as_dict)
-
     def cleanup(self):
         """Clear the cache until it shrinks to the requested size.
 
 
=== modified file 'breezy/merge.py'
--- breezy/merge.py	2017-05-22 00:56:52 +0000
+++ breezy/merge.py	2017-05-30 21:16:02 +0000
@@ -48,10 +48,6 @@
     hooks,
     registry,
     )
-from .symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 # TODO: Report back as changes are merged in
 
 
 
=== modified file 'breezy/missing.py'
--- breezy/missing.py	2017-05-22 00:56:52 +0000
+++ breezy/missing.py	2017-05-30 21:16:02 +0000
@@ -20,7 +20,6 @@
 
 from . import (
     log,
-    symbol_versioning,
     )
 from . import revision as _mod_revision
 
@@ -50,8 +49,7 @@
 
 def find_unmerged(local_branch, remote_branch, restrict='all',
                   include_merged=None, backward=False,
-                  local_revid_range=None, remote_revid_range=None,
-                  include_merges=symbol_versioning.DEPRECATED_PARAMETER):
+                  local_revid_range=None, remote_revid_range=None):
     """Find revisions from each side that have not been merged.
 
     :param local_branch: Compare the history of local_branch
@@ -69,18 +67,10 @@
         revisions (lower bound, upper bound)
     :param remote_revid_range: Revision-id range for filtering remote_branch
         revisions (lower bound, upper bound)
-    :param include_merges: Deprecated historical alias for include_merged
 
     :return: A list of [(revno, revision_id)] for the mainline revisions on
         each side.
     """
-    if symbol_versioning.deprecated_passed(include_merges):
-        symbol_versioning.warn(
-            'include_merges was deprecated in 2.5.'
-            ' Use include_merged instead.',
-            DeprecationWarning, stacklevel=2)
-        if include_merged is None:
-            include_merged = include_merges
     if include_merged is None:
         include_merged = False
     local_branch.lock_read()
 
=== modified file 'breezy/mutabletree.py'
--- breezy/mutabletree.py	2017-05-25 01:35:55 +0000
+++ breezy/mutabletree.py	2017-05-30 21:16:02 +0000
@@ -189,8 +189,7 @@
         raise NotImplementedError(self.apply_inventory_delta)
 
     @needs_write_lock
-    def commit(self, message=None, revprops=None, *args,
-               **kwargs):
+    def commit(self, message=None, revprops=None, *args, **kwargs):
         # avoid circular imports
         from breezy import commit
         possible_master_transports=[]
@@ -198,7 +197,6 @@
                 revprops,
                 self.branch,
                 kwargs.pop('authors', None),
-                kwargs.pop('author', None),
                 kwargs.get('local', False),
                 possible_master_transports)
         # args for wt.commit start at message from the Commit.commit method,
 
=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2017-05-30 19:39:52 +0000
+++ breezy/osutils.py	2017-05-30 21:16:02 +0000
@@ -46,7 +46,6 @@
 import unicodedata
 
 from breezy import (
-    cache_utf8,
     config,
     errors,
     trace,
@@ -59,13 +58,6 @@
     PY3,
     text_type,
     )
-from .symbol_versioning import (
-    DEPRECATED_PARAMETER,
-    deprecated_function,
-    deprecated_in,
-    deprecated_passed,
-    warn as warn_deprecated,
-    )
 
 from hashlib import (
     md5,
@@ -74,7 +66,7 @@
 
 
 import breezy
-from . import symbol_versioning, _fs_enc
+from . import _fs_enc
 
 
 # Cross platform wall-clock time functionality with decent resolution.
@@ -1415,33 +1407,22 @@
     return unicode_or_utf8_string.encode('utf-8')
 
 
-_revision_id_warning = ('Unicode revision ids were deprecated in bzr 0.15.'
-                        ' Revision id generators should be creating utf8'
-                        ' revision ids.')
-
-
-def safe_revision_id(unicode_or_utf8_string, warn=True):
+def safe_revision_id(unicode_or_utf8_string):
     """Revision ids should now be utf8, but at one point they were unicode.
 
     :param unicode_or_utf8_string: A possibly Unicode revision_id. (can also be
         utf8 or None).
-    :param warn: Functions that are sanitizing user data can set warn=False
     :return: None or a utf8 revision id.
     """
     if (unicode_or_utf8_string is None
         or unicode_or_utf8_string.__class__ == str):
         return unicode_or_utf8_string
-    if warn:
-        symbol_versioning.warn(_revision_id_warning, DeprecationWarning,
-                               stacklevel=2)
-    return cache_utf8.encode(unicode_or_utf8_string)
-
-
-_file_id_warning = ('Unicode file ids were deprecated in bzr 0.15. File id'
-                    ' generators should be creating utf8 file ids.')
-
-
-def safe_file_id(unicode_or_utf8_string, warn=True):
+    raise TypeError('Unicode revision ids are no longer supported. '
+                    'Revision id generators should be creating utf8 revision '
+                    'ids.')
+
+
+def safe_file_id(unicode_or_utf8_string):
     """File ids should now be utf8, but at one point they were unicode.
 
     This is the same as safe_utf8, except it uses the cached encode functions
@@ -1449,16 +1430,13 @@
 
     :param unicode_or_utf8_string: A possibly Unicode file_id. (can also be
         utf8 or None).
-    :param warn: Functions that are sanitizing user data can set warn=False
     :return: None or a utf8 file id.
     """
     if (unicode_or_utf8_string is None
         or unicode_or_utf8_string.__class__ == str):
         return unicode_or_utf8_string
-    if warn:
-        symbol_versioning.warn(_file_id_warning, DeprecationWarning,
-                               stacklevel=2)
-    return cache_utf8.encode(unicode_or_utf8_string)
+    raise TypeError('Unicode file ids are no longer supported. '
+                    'File id generators should be creating utf8 file ids.')
 
 
 _platform_normalizes_filenames = False
@@ -2034,7 +2012,7 @@
 _cached_user_encoding = None
 
 
-def get_user_encoding(use_cache=DEPRECATED_PARAMETER):
+def get_user_encoding():
     """Find out what the preferred user encoding is.
 
     This is generally the encoding that is used for command line parameters
@@ -2044,9 +2022,6 @@
     :return: A string defining the preferred user encoding
     """
     global _cached_user_encoding
-    if deprecated_passed(use_cache):
-        warn_deprecated("use_cache should only have been used for tests",
-            DeprecationWarning, stacklevel=2) 
     if _cached_user_encoding is not None:
         return _cached_user_encoding
 
@@ -2319,30 +2294,6 @@
             raise
 
 
-@deprecated_function(deprecated_in((2, 2, 0)))
-def re_compile_checked(re_string, flags=0, where=""):
-    """Return a compiled re, or raise a sensible error.
-
-    This should only be used when compiling user-supplied REs.
-
-    :param re_string: Text form of regular expression.
-    :param flags: eg re.IGNORECASE
-    :param where: Message explaining to the user the context where
-        it occurred, eg 'log search filter'.
-    """
-    # from https://bugs.launchpad.net/bzr/+bug/251352
-    try:
-        re_obj = re.compile(re_string, flags)
-        re_obj.search("")
-        return re_obj
-    except errors.InvalidPattern as e:
-        if where:
-            where = ' in ' + where
-        # despite the name 'error' is a type
-        raise errors.BzrCommandError('Invalid regular expression%s: %s'
-            % (where, e.msg))
-
-
 if sys.platform == "win32":
     def getchar():
         import msvcrt
 
=== modified file 'breezy/plugins/weave_fmt/bzrdir.py'
--- breezy/plugins/weave_fmt/bzrdir.py	2017-05-25 01:35:55 +0000
+++ breezy/plugins/weave_fmt/bzrdir.py	2017-05-30 21:16:02 +0000
@@ -874,14 +874,10 @@
             return self.transport
         raise errors.IncompatibleFormat(workingtree_format, self._format)
 
-    def needs_format_conversion(self, format=None):
+    def needs_format_conversion(self, format):
         """See ControlDir.needs_format_conversion()."""
         # if the format is not the same as the system default,
         # an upgrade is needed.
-        if format is None:
-            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
-                % 'needs_format_conversion(format=None)')
-            format = BzrDirFormat.get_default_format()
         return not isinstance(self._format, format.__class__)
 
     def open_branch(self, name=None, unsupported=False,
@@ -945,11 +941,8 @@
         """See ControlDir.create_repository."""
         return self._format.repository_format.initialize(self, shared)
 
-    def needs_format_conversion(self, format=None):
+    def needs_format_conversion(self, format):
         """Format 4 dirs are always in need of conversion."""
-        if format is None:
-            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
-                % 'needs_format_conversion(format=None)')
         return True
 
     def open_repository(self):
 
=== modified file 'breezy/plugins/weave_fmt/repository.py'
--- breezy/plugins/weave_fmt/repository.py	2017-05-22 00:56:52 +0000
+++ breezy/plugins/weave_fmt/repository.py	2017-05-30 21:16:02 +0000
@@ -41,7 +41,6 @@
     lockable_files,
     lockdir,
     osutils,
-    symbol_versioning,
     trace,
     tuned_gzip,
     urlutils,
@@ -822,7 +821,6 @@
 
     @needs_read_lock
     def search_missing_revision_ids(self,
-            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
             find_ghosts=True, revision_ids=None, if_present_ids=None,
             limit=None):
         """See InterRepository.search_missing_revision_ids()."""
@@ -837,17 +835,6 @@
         # disk format scales terribly for push anyway due to rewriting
         # inventory.weave, this is considered acceptable.
         # - RBC 20060209
-        if symbol_versioning.deprecated_passed(revision_id):
-            symbol_versioning.warn(
-                'search_missing_revision_ids(revision_id=...) was '
-                'deprecated in 2.4.  Use revision_ids=[...] instead.',
-                DeprecationWarning, stacklevel=2)
-            if revision_ids is not None:
-                raise AssertionError(
-                    'revision_ids is mutually exclusive with revision_id')
-            if revision_id is not None:
-                revision_ids = [revision_id]
-        del revision_id
         source_ids_set = self._present_source_revisions_for(
             revision_ids, if_present_ids)
         # source_ids is the worst possible case we may need to pull.
 
=== modified file 'breezy/remote.py'
--- breezy/remote.py	2017-05-25 01:35:55 +0000
+++ breezy/remote.py	2017-05-30 21:16:02 +0000
@@ -37,7 +37,6 @@
     repository as _mod_repository,
     revision as _mod_revision,
     static_tuple,
-    symbol_versioning,
     testament as _mod_testament,
     urlutils,
     vf_repository,
@@ -2101,7 +2100,6 @@
 
     @needs_read_lock
     def search_missing_revision_ids(self, other,
-            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
             find_ghosts=True, revision_ids=None, if_present_ids=None,
             limit=None):
         """Return the revision ids that other has that this does not.
@@ -2110,16 +2108,6 @@
 
         revision_id: only return revision ids included by revision_id.
         """
-        if symbol_versioning.deprecated_passed(revision_id):
-            symbol_versioning.warn(
-                'search_missing_revision_ids(revision_id=...) was '
-                'deprecated in 2.4.  Use revision_ids=[...] instead.',
-                DeprecationWarning, stacklevel=2)
-            if revision_ids is not None:
-                raise AssertionError(
-                    'revision_ids is mutually exclusive with revision_id')
-            if revision_id is not None:
-                revision_ids = [revision_id]
         inter_repo = _mod_repository.InterRepository.get(other, self)
         return inter_repo.search_missing_revision_ids(
             find_ghosts=find_ghosts, revision_ids=revision_ids,
 
=== modified file 'breezy/repofmt/knitrepo.py'
--- breezy/repofmt/knitrepo.py	2017-05-22 00:56:52 +0000
+++ breezy/repofmt/knitrepo.py	2017-05-30 21:16:02 +0000
@@ -49,7 +49,6 @@
     VersionedFileCommitBuilder,
     VersionedFileRootCommitBuilder,
     )
-from .. import symbol_versioning
 
 
 class _KnitParentsProvider(object):
 
=== modified file 'breezy/repository.py'
--- breezy/repository.py	2017-05-25 01:35:55 +0000
+++ breezy/repository.py	2017-05-30 21:16:02 +0000
@@ -43,7 +43,6 @@
     bzrdir,
     errors,
     registry,
-    symbol_versioning,
     ui,
     )
 from .decorators import needs_read_lock, needs_write_lock, only_raises
@@ -577,25 +576,14 @@
 
     @needs_read_lock
     def search_missing_revision_ids(self, other,
-            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
             find_ghosts=True, revision_ids=None, if_present_ids=None,
             limit=None):
         """Return the revision ids that other has that this does not.
 
         These are returned in topological order.
 
-        revision_id: only return revision ids included by revision_id.
+        revision_ids: only return revision ids included by revision_id.
         """
-        if symbol_versioning.deprecated_passed(revision_id):
-            symbol_versioning.warn(
-                'search_missing_revision_ids(revision_id=...) was '
-                'deprecated in 2.4.  Use revision_ids=[...] instead.',
-                DeprecationWarning, stacklevel=3)
-            if revision_ids is not None:
-                raise AssertionError(
-                    'revision_ids is mutually exclusive with revision_id')
-            if revision_id is not None:
-                revision_ids = [revision_id]
         return InterRepository.get(other, self).search_missing_revision_ids(
             find_ghosts=find_ghosts, revision_ids=revision_ids,
             if_present_ids=if_present_ids, limit=limit)
@@ -1662,13 +1650,10 @@
 
     @needs_read_lock
     def search_missing_revision_ids(self,
-            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
             find_ghosts=True, revision_ids=None, if_present_ids=None,
             limit=None):
         """Return the revision ids that source has that target does not.
 
-        :param revision_id: only return revision ids included by this
-            revision_id.
         :param revision_ids: return revision ids included by these
             revision_ids.  NoSuchRevision will be raised if any of these
             revisions are not present.
 
=== modified file 'breezy/revision.py'
--- breezy/revision.py	2017-05-22 00:56:52 +0000
+++ breezy/revision.py	2017-05-30 21:16:02 +0000
@@ -26,7 +26,6 @@
 """)
 from . import (
     errors,
-    symbol_versioning,
     )
 from .osutils import contains_whitespace
 
@@ -218,17 +217,14 @@
 def ensure_null(revision_id):
     """Ensure only NULL_REVISION is used to represent the null revision"""
     if revision_id is None:
-        symbol_versioning.warn('NULL_REVISION should be used for the null'
-            ' revision instead of None, as of bzr 0.91.',
-            DeprecationWarning, stacklevel=2)
-        return NULL_REVISION
-    else:
-        return revision_id
+        raise ValueError(
+            'NULL_REVISION should be used for the null'
+            ' revision instead of None.')
+    return revision_id
 
 
 def is_null(revision_id):
     if revision_id is None:
-        symbol_versioning.warn('NULL_REVISION should be used for the null'
-            ' revision instead of None, as of bzr 0.90.',
-            DeprecationWarning, stacklevel=2)
-    return revision_id in (None, NULL_REVISION)
+        raise ValueError('NULL_REVISION should be used for the null'
+                         ' revision instead of None.')
+    return (revision_id == NULL_REVISION)
 
=== modified file 'breezy/revisionspec.py'
--- breezy/revisionspec.py	2017-05-22 00:56:52 +0000
+++ breezy/revisionspec.py	2017-05-30 21:16:02 +0000
@@ -24,9 +24,9 @@
 
 from breezy import (
     branch as _mod_branch,
+    cache_utf8,
     osutils,
     revision,
-    symbol_versioning,
     workingtree,
     )
 from breezy.i18n import gettext
@@ -109,16 +109,11 @@
             self.revno, self.rev_id, self.branch)
 
     @staticmethod
-    def from_revision_id(branch, revision_id, revs=symbol_versioning.DEPRECATED_PARAMETER):
+    def from_revision_id(branch, revision_id):
         """Construct a RevisionInfo given just the id.
 
         Use this if you don't know or care what the revno is.
         """
-        if symbol_versioning.deprecated_passed(revs):
-            symbol_versioning.warn(
-                'RevisionInfo.from_revision_id(revs) was deprecated in 2.5.',
-                DeprecationWarning,
-                stacklevel=2)
         return RevisionInfo(branch, revno=None, rev_id=revision_id)
 
 
@@ -142,8 +137,6 @@
     """
 
     prefix = None
-    # wants_revision_history has been deprecated in 2.5.
-    wants_revision_history = False
     dwim_catchable_exceptions = (errors.InvalidRevisionSpec,)
     """Exceptions that RevisionSpec_dwim._match_on will catch.
 
@@ -185,11 +178,9 @@
             called directly. Only from RevisionSpec.from_string()
         """
         if not _internal:
-            symbol_versioning.warn('Creating a RevisionSpec directly has'
-                                   ' been deprecated in version 0.11. Use'
-                                   ' RevisionSpec.from_string()'
-                                   ' instead.',
-                                   DeprecationWarning, stacklevel=2)
+            raise AssertionError(
+                'Creating a RevisionSpec directly is not supported. '
+                'Use RevisionSpec.from_string() instead.')
         self.user_spec = spec
         if self.prefix and spec.startswith(self.prefix):
             spec = spec[len(self.prefix):]
@@ -212,27 +203,7 @@
             raise errors.InvalidRevisionSpec(self.spec, branch)
 
     def in_history(self, branch):
-        if branch:
-            if self.wants_revision_history:
-                symbol_versioning.warn(
-                    "RevisionSpec.wants_revision_history was "
-                    "deprecated in 2.5 (%s)." % self.__class__.__name__,
-                    DeprecationWarning)
-                branch.lock_read()
-                try:
-                    graph = branch.repository.get_graph()
-                    revs = list(graph.iter_lefthand_ancestry(
-                        branch.last_revision(), [revision.NULL_REVISION]))
-                finally:
-                    branch.unlock()
-                revs.reverse()
-            else:
-                revs = None
-        else:
-            # this should never trigger.
-            # TODO: make it a deprecated code path. RBC 20060928
-            revs = None
-        return self._match_on_and_check(branch, revs)
+        return self._match_on_and_check(branch, revs=None)
 
         # FIXME: in_history is somewhat broken,
         # it will return non-history revisions in many
@@ -341,13 +312,6 @@
             except rs_class.dwim_catchable_exceptions:
                 pass
 
-        # Try the old (deprecated) dwim list:
-        for rs_class in dwim_revspecs:
-            try:
-                return self._try_spectype(rs_class, branch)
-            except rs_class.dwim_catchable_exceptions:
-                pass
-
         # Well, I dunno what it is. Note that we don't try to keep track of the
         # first of last exception raised during the DWIM tries as none seems
         # really relevant.
@@ -502,7 +466,9 @@
         # self.spec comes straight from parsing the command line arguments,
         # so we expect it to be a Unicode string. Switch it to the internal
         # representation.
-        return osutils.safe_revision_id(self.spec, warn=False)
+        if isinstance(self.spec, unicode):
+            return cache_utf8.encode(self.spec)
+        return self.spec
 
 
 
@@ -986,9 +952,6 @@
 # The order in which we want to DWIM a revision spec without any prefix.
 # revno is always tried first and isn't listed here, this is used by
 # RevisionSpec_dwim._match_on
-dwim_revspecs = symbol_versioning.deprecated_list(
-    symbol_versioning.deprecated_in((2, 4, 0)), "dwim_revspecs", [])
-
 RevisionSpec_dwim.append_possible_revspec(RevisionSpec_tag)
 RevisionSpec_dwim.append_possible_revspec(RevisionSpec_revid)
 RevisionSpec_dwim.append_possible_revspec(RevisionSpec_date)
 
=== modified file 'breezy/tag.py'
--- breezy/tag.py	2017-05-22 00:56:52 +0000
+++ breezy/tag.py	2017-05-30 21:16:02 +0000
@@ -38,7 +38,6 @@
     bencode,
     cleanup,
     errors,
-    symbol_versioning,
     trace,
     )
 """)
@@ -356,31 +355,6 @@
         return result, updates, conflicts
 
 
-def _merge_tags_if_possible(from_branch, to_branch, ignore_master=False):
-    # Try hard to support merge_to implementations that don't expect
-    # 'ignore_master' (new in bzr 2.3).  First, if the flag isn't set then we
-    # can safely avoid passing ignore_master at all.
-    if not ignore_master:
-        from_branch.tags.merge_to(to_branch.tags)
-        return
-    # If the flag is set, try to pass it, but be ready to catch TypeError.
-    try:
-        from_branch.tags.merge_to(to_branch.tags, ignore_master=ignore_master)
-    except TypeError:
-        # Probably this implementation of 'merge_to' is from a plugin that
-        # doesn't expect the 'ignore_master' keyword argument (e.g. bzr-svn
-        # 1.0.4).  There's a small risk that the TypeError is actually caused
-        # by a completely different problem (which is why we don't catch it for
-        # the ignore_master=False case), but even then there's probably no harm
-        # in calling a second time.
-        symbol_versioning.warn(
-            symbol_versioning.deprecated_in((2,3)) % (
-                "Tags.merge_to (of %r) that doesn't accept ignore_master kwarg"
-                % (from_branch.tags,),),
-            DeprecationWarning)
-        from_branch.tags.merge_to(to_branch.tags)
-
-
 def sort_natural(branch, tags):
     """Sort tags, with numeric substrings as numbers.
 
 
=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2017-05-24 16:33:08 +0000
+++ breezy/tests/__init__.py	2017-05-30 21:16:02 +0000
@@ -93,19 +93,10 @@
     text_type,
     )
 from ..smart import client, request
-from ..symbol_versioning import (
-    deprecated_function,
-    deprecated_in,
-    deprecated_method,
-    )
 from ..transport import (
     memory,
     pathfilter,
     )
-from ..symbol_versioning import (
-    deprecated_function,
-    deprecated_in,
-    )
 from ..tests import (
     fixtures,
     test_server,
@@ -899,7 +890,8 @@
 
 class StringIOWrapper(ui_testing.BytesIOWithEncoding):
 
-    @deprecated_method(deprecated_in((3, 0)))
+    @symbol_versioning.deprecated_method(
+        symbol_versioning.deprecated_in((3, 0)))
     def __init__(self, s=None):
         super(StringIOWrapper, self).__init__(s)
 
@@ -1556,10 +1548,6 @@
         else:
             self.assertEqual(expected_docstring, obj.__doc__)
 
-    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4)))
-    def failUnlessExists(self, path):
-        return self.assertPathExists(path)
-
     def assertPathExists(self, path):
         """Fail unless path or paths, which may be abs or relative, exist."""
         if not isinstance(path, basestring):
@@ -1569,10 +1557,6 @@
             self.assertTrue(osutils.lexists(path),
                 path + " does not exist")
 
-    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4)))
-    def failIfExists(self, path):
-        return self.assertPathDoesNotExist(path)
-
     def assertPathDoesNotExist(self, path):
         """Fail if path or paths, which may be abs or relative, exist."""
         if not isinstance(path, basestring):
@@ -4468,30 +4452,3 @@
             return result
 except ImportError:
     pass
-
-
-# API compatibility for old plugins; see bug 892622.
-for name in [
-    'Feature',
-    'HTTPServerFeature', 
-    'ModuleAvailableFeature',
-    'HTTPSServerFeature', 'SymlinkFeature', 'HardlinkFeature',
-    'OsFifoFeature', 'UnicodeFilenameFeature',
-    'ByteStringNamedFilesystem', 'UTF8Filesystem',
-    'BreakinFeature', 'CaseInsCasePresFilenameFeature',
-    'CaseInsensitiveFilesystemFeature', 'case_sensitive_filesystem_feature',
-    'posix_permissions_feature',
-    ]:
-    globals()[name] = _CompatabilityThunkFeature(
-        symbol_versioning.deprecated_in((2, 5, 0)),
-        'breezy.tests', name,
-        name, 'breezy.tests.features')
-
-
-for (old_name, new_name) in [
-    ('UnicodeFilename', 'UnicodeFilenameFeature'),
-    ]:
-    globals()[name] = _CompatabilityThunkFeature(
-        symbol_versioning.deprecated_in((2, 5, 0)),
-        'breezy.tests', old_name,
-        new_name, 'breezy.tests.features')
 
=== modified file 'breezy/tests/blackbox/__init__.py'
--- breezy/tests/blackbox/__init__.py	2017-05-23 14:08:03 +0000
+++ breezy/tests/blackbox/__init__.py	2017-05-30 21:16:02 +0000
@@ -23,10 +23,6 @@
 """
 
 
-from breezy.symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 from breezy import tests
 
 
@@ -144,11 +140,3 @@
 class ExternalBase(tests.TestCaseWithTransport):
     """Don't use this class anymore, use TestCaseWithTransport or similar"""
 
-    @deprecated_method(deprecated_in((2, 2, 0)))
-    def check_output(self, output, *args):
-        """Verify that the expected output matches what brz says.
-
-        The output is supplied first, so that you can supply a variable
-        number of arguments to bzr.
-        """
-        self.assertEqual(self.run_bzr(*args)[0], output)
 
=== modified file 'breezy/tests/blackbox/test_log.py'
--- breezy/tests/blackbox/test_log.py	2017-05-24 16:33:08 +0000
+++ breezy/tests/blackbox/test_log.py	2017-05-30 21:16:02 +0000
@@ -562,24 +562,6 @@
         self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
                              working_dir='level0')
 
-    def test_include_merges(self):
-        # Confirm --include-merges gives the same output as -n0
-        msg = ("The option '--include-merges' to 'brz log' "
-               "has been deprecated in brz 2.5. "
-               "Please use '--include-merged' instead.\n")
-        self.assertLogRevnos(['--include-merges'],
-                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
-                             working_dir='level0', err=msg)
-        self.assertLogRevnos(['--include-merges'],
-                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
-                             working_dir='level0', err=msg)
-        out_im, err_im = self.run_bzr('log --include-merges',
-                                      working_dir='level0')
-        out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
-        self.assertEqual(msg, err_im)
-        self.assertEqual('', err_n0)
-        self.assertEqual(out_im, out_n0)
-
     def test_include_merged(self):
         # Confirm --include-merged gives the same output as -n0
         expected = ['2', '1.1.2', '1.2.1', '1.1.1', '1']
 
=== modified file 'breezy/tests/per_branch/test_branch.py'
--- breezy/tests/per_branch/test_branch.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/per_branch/test_branch.py	2017-05-30 21:16:02 +0000
@@ -33,7 +33,6 @@
     repository,
     revision,
     shelf,
-    symbol_versioning,
     tests,
     )
 from breezy.tests import (
@@ -107,24 +106,6 @@
         self.addCleanup(tree.unlock)
         self.assertEqual(tree.get_file_text('foo-id'), 'hello')
 
-    def test_get_revision_delta(self):
-        tree_a = self.make_branch_and_tree('a')
-        self.build_tree(['a/foo'])
-        tree_a.add('foo', 'file1')
-        tree_a.commit('rev1', rev_id='rev1')
-        self.build_tree(['a/vla'])
-        tree_a.add('vla', 'file2')
-        tree_a.commit('rev2', rev_id='rev2')
-
-        delta = self.applyDeprecated(symbol_versioning.deprecated_in(
-            (2, 5, 0)), tree_a.branch.get_revision_delta, 1)
-        self.assertIsInstance(delta, _mod_delta.TreeDelta)
-        self.assertEqual([('foo', 'file1', 'file')], delta.added)
-        delta = self.applyDeprecated(symbol_versioning.deprecated_in(
-            (2, 5, 0)), tree_a.branch.get_revision_delta, 2)
-        self.assertIsInstance(delta, _mod_delta.TreeDelta)
-        self.assertEqual([('vla', 'file2', 'file')], delta.added)
-
     def get_unbalanced_tree_pair(self):
         """Return two branches, a and b, with one file in a."""
         tree_a = self.make_branch_and_tree('a')
 
=== modified file 'breezy/tests/per_branch/test_check.py'
--- breezy/tests/per_branch/test_check.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/per_branch/test_check.py	2017-05-30 21:16:02 +0000
@@ -25,7 +25,6 @@
 from ...sixish import (
     BytesIO,
     )
-from ...symbol_versioning import deprecated_in
 from . import TestCaseWithBranch
 
 
 
=== modified file 'breezy/tests/per_branch/test_get_revision_id_to_revno_map.py'
--- breezy/tests/per_branch/test_get_revision_id_to_revno_map.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/per_branch/test_get_revision_id_to_revno_map.py	2017-05-30 21:16:02 +0000
@@ -16,7 +16,6 @@
 
 """Tests for Branch.get_revision_id_to_revno_map()"""
 
-from breezy.symbol_versioning import deprecated_in
 from breezy.tests.per_branch import TestCaseWithBranch
 
 
 
=== modified file 'breezy/tests/per_branch/test_hooks.py'
--- breezy/tests/per_branch/test_hooks.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/per_branch/test_hooks.py	2017-05-30 21:16:02 +0000
@@ -23,7 +23,6 @@
     revision,
     tests,
     )
-from breezy.symbol_versioning import deprecated_in
 from breezy.tests import test_server
 
 class ChangeBranchTipTestCase(tests.TestCaseWithMemoryTransport):
 
=== modified file 'breezy/tests/per_branch/test_push.py'
--- breezy/tests/per_branch/test_push.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/per_branch/test_push.py	2017-05-30 21:16:02 +0000
@@ -27,7 +27,6 @@
     memorytree,
     push,
     revision,
-    symbol_versioning,
     tests,
     transport,
     )
 
=== modified file 'breezy/tests/per_interbranch/test_push.py'
--- breezy/tests/per_interbranch/test_push.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/per_interbranch/test_push.py	2017-05-30 21:16:02 +0000
@@ -27,7 +27,6 @@
     controldir,
     errors,
     push,
-    symbol_versioning,
     tests,
     vf_repository,
     )
 
=== modified file 'breezy/tests/per_interrepository/test_interrepository.py'
--- breezy/tests/per_interrepository/test_interrepository.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/per_interrepository/test_interrepository.py	2017-05-30 21:16:02 +0000
@@ -112,12 +112,6 @@
         self.assertRaises(errors.NoSuchRevision,
             repo_b.search_missing_revision_ids, repo_a, revision_ids=['pizza'],
             find_ghosts=False)
-        self.callDeprecated(
-            ['search_missing_revision_ids(revision_id=...) was deprecated in '
-             '2.4.  Use revision_ids=[...] instead.'],
-            self.assertRaises, errors.NoSuchRevision,
-            repo_b.search_missing_revision_ids, repo_a, revision_id='pizza',
-            find_ghosts=False)
 
     def test_search_missing_revision_ids_revision_limited(self):
         # revision ids in repository A that are not referenced by the
 
=== modified file 'breezy/tests/per_inventory/basics.py'
--- breezy/tests/per_inventory/basics.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/per_inventory/basics.py	2017-05-30 21:16:02 +0000
@@ -35,10 +35,6 @@
 
 from breezy.tests.per_inventory import TestCaseWithInventory
 
-from breezy.symbol_versioning import (
-    deprecated_in,
-    )
-
 
 class TestInventory(TestCaseWithInventory):
 
 
=== modified file 'breezy/tests/per_repository/test_repository.py'
--- breezy/tests/per_repository/test_repository.py	2017-05-24 16:21:50 +0000
+++ breezy/tests/per_repository/test_repository.py	2017-05-30 21:16:02 +0000
@@ -258,14 +258,7 @@
                              list(tree.list_files(include_root=True)))
         finally:
             tree.unlock()
-        tree = self.callDeprecated(['NULL_REVISION should be used for the null'
-            ' revision instead of None, as of bzr 0.91.'],
-            wt.branch.repository.revision_tree, None)
-        tree.lock_read()
-        try:
-            self.assertEqual([], list(tree.list_files(include_root=True)))
-        finally:
-            tree.unlock()
+        self.assertRaises(ValueError, wt.branch.repository.revision_tree, None)
         tree = wt.branch.repository.revision_tree(_mod_revision.NULL_REVISION)
         tree.lock_read()
         try:
 
=== modified file 'breezy/tests/per_repository_vf/test_repository.py'
--- breezy/tests/per_repository_vf/test_repository.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/per_repository_vf/test_repository.py	2017-05-30 21:16:02 +0000
@@ -27,7 +27,6 @@
     vf_repository,
     )
 
-from breezy.symbol_versioning import deprecated_in
 from breezy.tests.matchers import MatchesAncestry
 from breezy.tests.per_repository_vf import (
     TestCaseWithRepository,
 
=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/per_tree/test_tree.py	2017-05-30 21:16:02 +0000
@@ -24,9 +24,6 @@
     )
 from breezy.tests import TestSkipped
 from breezy.tests.per_tree import TestCaseWithTree
-from breezy.symbol_versioning import (
-    deprecated_in,
-    )
 
 
 class TestAnnotate(TestCaseWithTree):
@@ -284,22 +281,6 @@
         self.assertTrue(tree.has_id('file-id'))
         self.assertFalse(tree.has_id('dir-id'))
 
-    def test___contains__(self):
-        work_tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/file'])
-        work_tree.add('file', 'file-id')
-        tree = self._convert_tree(work_tree)
-        tree.lock_read()
-        self.addCleanup(tree.unlock)
-        self.assertTrue(
-            self.applyDeprecated(
-                deprecated_in((2, 4, 0)),
-                tree.__contains__, 'file-id'))
-        self.assertFalse(
-            self.applyDeprecated(
-                deprecated_in((2, 4, 0)),
-                tree.__contains__, 'dir-id'))
-
 
 class TestExtras(TestCaseWithTree):
 
 
=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2017-05-30 21:16:02 +0000
@@ -27,7 +27,6 @@
     errors,
     osutils,
     revision as _mod_revision,
-    symbol_versioning,
     tests,
     trace,
     urlutils,
 
=== modified file 'breezy/tests/test_annotate.py'
--- breezy/tests/test_annotate.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_annotate.py	2017-05-30 21:16:02 +0000
@@ -20,7 +20,6 @@
 
 from .. import (
     annotate,
-    symbol_versioning,
     tests,
     )
 from ..sixish import (
 
=== modified file 'breezy/tests/test_atomicfile.py'
--- breezy/tests/test_atomicfile.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_atomicfile.py	2017-05-30 21:16:02 +0000
@@ -24,7 +24,6 @@
     atomicfile,
     errors,
     osutils,
-    symbol_versioning,
     )
 from . import TestCaseInTempDir, TestSkipped
 
 
=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_commit.py	2017-05-30 21:16:02 +0000
@@ -790,13 +790,13 @@
         self.assertFalse('authors' in rev.properties)
 
     def test_commit_author(self):
-        """Passing a non-empty author kwarg to MutableTree.commit should add
+        """Passing a non-empty authors kwarg to MutableTree.commit should add
         the 'author' revision property.
         """
         tree = self.make_branch_and_tree('foo')
-        rev_id = self.callDeprecated(['The parameter author was '
-                'deprecated in version 1.13. Use authors instead'],
-                tree.commit, 'commit 1', author='John Doe <[e-mail]>')
+        rev_id = tree.commit(
+            'commit 1',
+            authors=['John Doe <[e-mail]>'])
         rev = tree.branch.repository.get_revision(rev_id)
         self.assertEqual('John Doe <[e-mail]>',
                          rev.properties['authors'])
@@ -820,13 +820,6 @@
                 'Jane Rey <[e-mail]>', rev.properties['authors'])
         self.assertFalse('author' in rev.properties)
 
-    def test_author_and_authors_incompatible(self):
-        tree = self.make_branch_and_tree('foo')
-        self.assertRaises(AssertionError, tree.commit, 'commit 1',
-                authors=['John Doe <[e-mail]>',
-                         'Jane Rey <[e-mail]>'],
-                author="Jack Me <[e-mail]>")
-
     def test_author_with_newline_rejected(self):
         tree = self.make_branch_and_tree('foo')
         self.assertRaises(AssertionError, tree.commit, 'commit 1',
 
=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_config.py	2017-05-30 21:16:02 +0000
@@ -42,9 +42,6 @@
 from ..sixish import (
     BytesIO,
     )
-from ..symbol_versioning import (
-    deprecated_in,
-    )
 from ..transport import remote as transport_remote
 from . import (
     features,
@@ -488,60 +485,10 @@
                          my_config.username())
         self.assertEqual(['_get_user_id'], my_config._calls)
 
-    def test_signatures_default(self):
-        my_config = config.Config()
-        self.assertFalse(
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.signature_needed))
-        self.assertEqual(config.CHECK_IF_POSSIBLE,
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.signature_checking))
-        self.assertEqual(config.SIGN_WHEN_REQUIRED,
-                self.applyDeprecated(deprecated_in((2, 5, 0)),
-                    my_config.signing_policy))
-
-    def test_signatures_template_method(self):
-        my_config = InstrumentedConfig()
-        self.assertEqual(config.CHECK_NEVER,
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.signature_checking))
-        self.assertEqual(['_get_signature_checking'], my_config._calls)
-
-    def test_signatures_template_method_none(self):
-        my_config = InstrumentedConfig()
-        my_config._signatures = None
-        self.assertEqual(config.CHECK_IF_POSSIBLE,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             my_config.signature_checking))
-        self.assertEqual(['_get_signature_checking'], my_config._calls)
-
-    def test_gpg_signing_command_default(self):
-        my_config = config.Config()
-        self.assertEqual('gpg',
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.gpg_signing_command))
-
     def test_get_user_option_default(self):
         my_config = config.Config()
         self.assertEqual(None, my_config.get_user_option('no_option'))
 
-    def test_post_commit_default(self):
-        my_config = config.Config()
-        self.assertEqual(None, self.applyDeprecated(deprecated_in((2, 5, 0)),
-                                                    my_config.post_commit))
-
-
-    def test_log_format_default(self):
-        my_config = config.Config()
-        self.assertEqual('long',
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                                              my_config.log_format))
-
-    def test_acceptable_keys_default(self):
-        my_config = config.Config()
-        self.assertEqual(None, self.applyDeprecated(deprecated_in((2, 5, 0)),
-            my_config.acceptable_keys))
-
     def test_validate_signatures_in_log_default(self):
         my_config = config.Config()
         self.assertEqual(False, my_config.validate_signatures_in_log())
@@ -656,21 +603,6 @@
         self.assertTrue(isinstance(self.uid, int))
         self.assertTrue(isinstance(self.gid, int))
 
-    def test_get_filename_parameter_is_deprecated_(self):
-        conf = self.callDeprecated([
-            'IniBasedConfig.__init__(get_filename) was deprecated in 2.3.'
-            ' Use file_name instead.'],
-            config.IniBasedConfig, lambda: 'ini.conf')
-        self.assertEqual('ini.conf', conf.file_name)
-
-    def test_get_parser_file_parameter_is_deprecated_(self):
-        config_file = BytesIO(sample_config_text.encode('utf-8'))
-        conf = config.IniBasedConfig.from_string(sample_config_text)
-        conf = self.callDeprecated([
-            'IniBasedConfig._get_parser(file=xxx) was deprecated in 2.3.'
-            ' Use IniBasedConfig(_content=xxx) instead.'],
-            conf._get_parser, file=config_file)
-
 
 class TestIniConfigSaving(tests.TestCaseInTempDir):
 
@@ -1004,30 +936,6 @@
         # automatically cast to list
         self.assertEqual(['x'], get_list('one_item'))
 
-    def test_get_user_option_as_int_from_SI(self):
-        conf, parser = self.make_config_parser("""
-plain = 100
-si_k = 5k,
-si_kb = 5kb,
-si_m = 5M,
-si_mb = 5MB,
-si_g = 5g,
-si_gb = 5gB,
-""")
-        def get_si(s, default=None):
-            return self.applyDeprecated(
-                deprecated_in((2, 5, 0)),
-                conf.get_user_option_as_int_from_SI, s, default)
-        self.assertEqual(100, get_si('plain'))
-        self.assertEqual(5000, get_si('si_k'))
-        self.assertEqual(5000, get_si('si_kb'))
-        self.assertEqual(5000000, get_si('si_m'))
-        self.assertEqual(5000000, get_si('si_mb'))
-        self.assertEqual(5000000000, get_si('si_g'))
-        self.assertEqual(5000000000, get_si('si_gb'))
-        self.assertEqual(None, get_si('non-exist'))
-        self.assertEqual(42, get_si('non-exist-with-default',  42))
-
 
 class TestSupressWarning(TestIniConfig):
 
@@ -1181,6 +1089,14 @@
 
 class TestGlobalConfigItems(tests.TestCaseInTempDir):
 
+    def _get_empty_config(self):
+        my_config = config.GlobalConfig()
+        return my_config
+
+    def _get_sample_config(self):
+        my_config = config.GlobalConfig.from_string(sample_config_text)
+        return my_config
+
     def test_user_id(self):
         my_config = config.GlobalConfig.from_string(sample_config_text)
         self.assertEqual(u"Erik B\u00e5gfors <[e-mail]>",
@@ -1190,68 +1106,6 @@
         my_config = config.GlobalConfig()
         self.assertEqual(None, my_config._get_user_id())
 
-    def test_signatures_always(self):
-        my_config = config.GlobalConfig.from_string(sample_always_signatures)
-        self.assertEqual(config.CHECK_NEVER,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             my_config.signature_checking))
-        self.assertEqual(config.SIGN_ALWAYS,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             my_config.signing_policy))
-        self.assertEqual(True,
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.signature_needed))
-
-    def test_signatures_if_possible(self):
-        my_config = config.GlobalConfig.from_string(sample_maybe_signatures)
-        self.assertEqual(config.CHECK_NEVER,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             my_config.signature_checking))
-        self.assertEqual(config.SIGN_WHEN_REQUIRED,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             my_config.signing_policy))
-        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
-            my_config.signature_needed))
-
-    def test_signatures_ignore(self):
-        my_config = config.GlobalConfig.from_string(sample_ignore_signatures)
-        self.assertEqual(config.CHECK_ALWAYS,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             my_config.signature_checking))
-        self.assertEqual(config.SIGN_NEVER,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             my_config.signing_policy))
-        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
-            my_config.signature_needed))
-
-    def _get_sample_config(self):
-        my_config = config.GlobalConfig.from_string(sample_config_text)
-        return my_config
-
-    def test_gpg_signing_command(self):
-        my_config = self._get_sample_config()
-        self.assertEqual("gnome-gpg",
-            self.applyDeprecated(
-                deprecated_in((2, 5, 0)), my_config.gpg_signing_command))
-        self.assertEqual(False, self.applyDeprecated(deprecated_in((2, 5, 0)),
-            my_config.signature_needed))
-
-    def test_gpg_signing_key(self):
-        my_config = self._get_sample_config()
-        self.assertEqual("DD4D5088",
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.gpg_signing_key))
-
-    def _get_empty_config(self):
-        my_config = config.GlobalConfig()
-        return my_config
-
-    def test_gpg_signing_command_unset(self):
-        my_config = self._get_empty_config()
-        self.assertEqual("gpg",
-            self.applyDeprecated(
-                deprecated_in((2, 5, 0)), my_config.gpg_signing_command))
-
     def test_get_user_option_default(self):
         my_config = self._get_empty_config()
         self.assertEqual(None, my_config.get_user_option('no_option'))
@@ -1261,24 +1115,6 @@
         self.assertEqual("something",
                          my_config.get_user_option('user_global_option'))
 
-    def test_post_commit_default(self):
-        my_config = self._get_sample_config()
-        self.assertEqual(None,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                                              my_config.post_commit))
-
-    def test_configured_logformat(self):
-        my_config = self._get_sample_config()
-        self.assertEqual("short",
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                                              my_config.log_format))
-
-    def test_configured_acceptable_keys(self):
-        my_config = self._get_sample_config()
-        self.assertEqual("amy",
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.acceptable_keys))
-
     def test_configured_validate_signatures_in_log(self):
         my_config = self._get_sample_config()
         self.assertEqual(True, my_config.validate_signatures_in_log())
@@ -1517,57 +1353,6 @@
         self.assertEqual('Robert Collins <[e-mail]>',
                          self.my_config.username())
 
-    def test_signatures_not_set(self):
-        self.get_branch_config('http://www.example.com',
-                                 global_config=sample_ignore_signatures)
-        self.assertEqual(config.CHECK_ALWAYS,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             self.my_config.signature_checking))
-        self.assertEqual(config.SIGN_NEVER,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             self.my_config.signing_policy))
-
-    def test_signatures_never(self):
-        self.get_branch_config('/a/c')
-        self.assertEqual(config.CHECK_NEVER,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             self.my_config.signature_checking))
-
-    def test_signatures_when_available(self):
-        self.get_branch_config('/a/', global_config=sample_ignore_signatures)
-        self.assertEqual(config.CHECK_IF_POSSIBLE,
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                             self.my_config.signature_checking))
-
-    def test_signatures_always(self):
-        self.get_branch_config('/b')
-        self.assertEqual(config.CHECK_ALWAYS,
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                         self.my_config.signature_checking))
-
-    def test_gpg_signing_command(self):
-        self.get_branch_config('/b')
-        self.assertEqual("gnome-gpg",
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                self.my_config.gpg_signing_command))
-
-    def test_gpg_signing_command_missing(self):
-        self.get_branch_config('/a')
-        self.assertEqual("false",
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                self.my_config.gpg_signing_command))
-
-    def test_gpg_signing_key(self):
-        self.get_branch_config('/b')
-        self.assertEqual("DD4D5088", self.applyDeprecated(deprecated_in((2, 5, 0)),
-            self.my_config.gpg_signing_key))
-
-    def test_gpg_signing_key_default(self):
-        self.get_branch_config('/a')
-        self.assertEqual("[e-mail]",
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                self.my_config.gpg_signing_key))
-
     def test_get_user_option_global(self):
         self.get_branch_config('/a')
         self.assertEqual('something',
@@ -1637,32 +1422,6 @@
             'http://www.example.com', 'norecurse_option'),
             config.POLICY_NONE)
 
-    def test_set_user_option_recurse_false_section(self):
-        # The following section has recurse=False set.  The test is to
-        # make sure that a normal option can be added to the section,
-        # converting recurse=False to the norecurse policy.
-        self.get_branch_config('http://www.example.com/norecurse')
-        self.callDeprecated(['The recurse option is deprecated as of 0.14.  '
-                             'The section "http://www.example.com/norecurse" '
-                             'has been converted to use policies.'],
-                            self.my_config.set_user_option,
-                            'foo', 'bar', store=config.STORE_LOCATION)
-        self.assertEqual(
-            self.my_location_config._get_option_policy(
-            'http://www.example.com/norecurse', 'foo'),
-            config.POLICY_NONE)
-        # The previously existing option is still norecurse:
-        self.assertEqual(
-            self.my_location_config._get_option_policy(
-            'http://www.example.com/norecurse', 'normal_option'),
-            config.POLICY_NORECURSE)
-
-    def test_post_commit_default(self):
-        self.get_branch_config('/a/c')
-        self.assertEqual('breezy.tests.test_config.post_commit',
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                                              self.my_config.post_commit))
-
     def get_branch_config(self, location, global_config=None,
                           location_config=None):
         my_branch = FakeBranch(location)
@@ -1678,33 +1437,6 @@
         self.my_config = my_config
         self.my_location_config = my_config._get_location_config()
 
-    def test_set_user_setting_sets_and_saves(self):
-        self.get_branch_config('/a/c')
-        record = InstrumentedConfigObj("foo")
-        self.my_location_config._parser = record
-
-        self.callDeprecated(['The recurse option is deprecated as of '
-                             '0.14.  The section "/a/c" has been '
-                             'converted to use policies.'],
-                            self.my_config.set_user_option,
-                            'foo', 'bar', store=config.STORE_LOCATION)
-        self.assertEqual([('reload',),
-                          ('__contains__', '/a/c'),
-                          ('__contains__', '/a/c/'),
-                          ('__setitem__', '/a/c', {}),
-                          ('__getitem__', '/a/c'),
-                          ('__setitem__', 'foo', 'bar'),
-                          ('__getitem__', '/a/c'),
-                          ('as_bool', 'recurse'),
-                          ('__getitem__', '/a/c'),
-                          ('__delitem__', 'recurse'),
-                          ('__getitem__', '/a/c'),
-                          ('keys',),
-                          ('__getitem__', '/a/c'),
-                          ('__contains__', 'foo:policy'),
-                          ('write',)],
-                         record._calls[1:])
-
     def test_set_user_setting_sets_and_saves2(self):
         self.get_branch_config('/a/c')
         self.assertIs(self.my_config.get_user_option('foo'), None)
@@ -1771,64 +1503,11 @@
         self.assertEqual("Robert Collins <[e-mail]>",
                          my_config.username())
 
-    def test_signatures_forced(self):
-        my_config = self.get_branch_config(
-            global_config=sample_always_signatures)
-        self.assertEqual(config.CHECK_NEVER,
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.signature_checking))
-        self.assertEqual(config.SIGN_ALWAYS,
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.signing_policy))
-        self.assertTrue(self.applyDeprecated(deprecated_in((2, 5, 0)),
-            my_config.signature_needed))
-
-    def test_signatures_forced_branch(self):
-        my_config = self.get_branch_config(
-            global_config=sample_ignore_signatures,
-            branch_data_config=sample_always_signatures)
-        self.assertEqual(config.CHECK_NEVER,
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.signature_checking))
-        self.assertEqual(config.SIGN_ALWAYS,
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.signing_policy))
-        self.assertTrue(self.applyDeprecated(deprecated_in((2, 5, 0)),
-            my_config.signature_needed))
-
-    def test_gpg_signing_command(self):
-        my_config = self.get_branch_config(
-            global_config=sample_config_text,
-            # branch data cannot set gpg_signing_command
-            branch_data_config="gpg_signing_command=pgp")
-        self.assertEqual('gnome-gpg',
-            self.applyDeprecated(deprecated_in((2, 5, 0)),
-                my_config.gpg_signing_command))
-
     def test_get_user_option_global(self):
         my_config = self.get_branch_config(global_config=sample_config_text)
         self.assertEqual('something',
                          my_config.get_user_option('user_global_option'))
 
-    def test_post_commit_default(self):
-        my_config = self.get_branch_config(global_config=sample_config_text,
-                                      location='/a/c',
-                                      location_config=sample_branches_text)
-        self.assertEqual(my_config.branch.base, '/a/c')
-        self.assertEqual('breezy.tests.test_config.post_commit',
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                                              my_config.post_commit))
-        my_config.set_user_option('post_commit', 'rmtree_root')
-        # post-commit is ignored when present in branch data
-        self.assertEqual('breezy.tests.test_config.post_commit',
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                                              my_config.post_commit))
-        my_config.set_user_option('post_commit', 'rmtree_root',
-                                  store=config.STORE_LOCATION)
-        self.assertEqual('rmtree_root',
-                         self.applyDeprecated(deprecated_in((2, 5, 0)),
-                                              my_config.post_commit))
-
     def test_config_precedence(self):
         # FIXME: eager test, luckily no persitent config file makes it fail
         # -- vila 20100716
 
=== modified file 'breezy/tests/test_hooks.py'
--- breezy/tests/test_hooks.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_hooks.py	2017-05-30 21:16:02 +0000
@@ -30,9 +30,6 @@
     known_hooks,
     known_hooks_key_to_object,
     )
-from ..symbol_versioning import (
-    deprecated_in,
-    )
 
 
 class TestHooks(tests.TestCase):
 
=== modified file 'breezy/tests/test_lru_cache.py'
--- breezy/tests/test_lru_cache.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_lru_cache.py	2017-05-30 21:16:02 +0000
@@ -18,7 +18,6 @@
 
 from .. import (
     lru_cache,
-    symbol_versioning,
     tests,
     )
 
@@ -128,13 +127,6 @@
 
         self.assertFalse('foo' in cache)
 
-    def test_cleanup_function_deprecated(self):
-        """Test that per-node cleanup functions are no longer allowed"""
-        cache = lru_cache.LRUCache()
-        self.assertRaises(ValueError, self.applyDeprecated,
-            symbol_versioning.deprecated_in((2, 5, 0)),
-            cache.add, "key", 1, cleanup=lambda: None)
-
     def test_len(self):
         cache = lru_cache.LRUCache(max_cache=10, after_cleanup_count=10)
 
 
=== modified file 'breezy/tests/test_osutils.py'
--- breezy/tests/test_osutils.py	2017-05-24 22:42:07 +0000
+++ breezy/tests/test_osutils.py	2017-05-30 21:16:02 +0000
@@ -829,17 +829,12 @@
         self.assertEqual('foobar', osutils.safe_revision_id('foobar'))
 
     def test_from_unicode_string_ascii_contents(self):
-        self.assertEqual('bargam',
-                         osutils.safe_revision_id(u'bargam', warn=False))
-
-    def test_from_unicode_deprecated(self):
-        self.assertEqual('bargam',
-            self.callDeprecated([osutils._revision_id_warning],
-                                osutils.safe_revision_id, u'bargam'))
+        self.assertRaises(TypeError,
+                          osutils.safe_revision_id, u'bargam')
 
     def test_from_unicode_string_unicode_contents(self):
-        self.assertEqual('bargam\xc2\xae',
-                         osutils.safe_revision_id(u'bargam\xae', warn=False))
+        self.assertRaises(TypeError,
+                         osutils.safe_revision_id, u'bargam\xae')
 
     def test_from_utf8_string(self):
         self.assertEqual('foo\xc2\xae',
@@ -856,16 +851,11 @@
         self.assertEqual('foobar', osutils.safe_file_id('foobar'))
 
     def test_from_unicode_string_ascii_contents(self):
-        self.assertEqual('bargam', osutils.safe_file_id(u'bargam', warn=False))
-
-    def test_from_unicode_deprecated(self):
-        self.assertEqual('bargam',
-            self.callDeprecated([osutils._file_id_warning],
-                                osutils.safe_file_id, u'bargam'))
+        self.assertRaises(TypeError, osutils.safe_file_id, u'bargam')
 
     def test_from_unicode_string_unicode_contents(self):
-        self.assertEqual('bargam\xc2\xae',
-                         osutils.safe_file_id(u'bargam\xae', warn=False))
+        self.assertRaises(TypeError,
+                          osutils.safe_file_id, u'bargam\xae')
 
     def test_from_utf8_string(self):
         self.assertEqual('foo\xc2\xae',
@@ -1831,32 +1821,6 @@
         self.assertRaises(IOError, osutils.resource_string, 'breezy', 'yyy.xx')
 
 
-class TestReCompile(tests.TestCase):
-
-    def _deprecated_re_compile_checked(self, *args, **kwargs):
-        return self.applyDeprecated(symbol_versioning.deprecated_in((2, 2, 0)),
-            osutils.re_compile_checked, *args, **kwargs)
-
-    def test_re_compile_checked(self):
-        r = self._deprecated_re_compile_checked(r'A*', re.IGNORECASE)
-        self.assertTrue(r.match('aaaa'))
-        self.assertTrue(r.match('aAaA'))
-
-    def test_re_compile_checked_error(self):
-        # like https://bugs.launchpad.net/bzr/+bug/251352
-
-        # Due to possible test isolation error, re.compile is not lazy at
-        # this point. We re-install lazy compile.
-        lazy_regex.install_lazy_compile()
-        err = self.assertRaises(
-            errors.BzrCommandError,
-            self._deprecated_re_compile_checked, '*', re.IGNORECASE, 'test case')
-        self.assertEqual(
-            'Invalid regular expression in test case: '
-            '"*" nothing to repeat',
-            str(err))
-
-
 class TestDirReader(tests.TestCaseInTempDir):
 
     scenarios = dir_reader_scenarios()
 
=== modified file 'breezy/tests/test_remote.py'
--- breezy/tests/test_remote.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_remote.py	2017-05-30 21:16:02 +0000
@@ -73,7 +73,6 @@
     SmartServerRepositoryGetStream_1_19,
     _stream_to_byte_stream,
     )
-from ..symbol_versioning import deprecated_in
 from . import (
     test_server,
     )
 
=== modified file 'breezy/tests/test_repository.py'
--- breezy/tests/test_repository.py	2017-05-25 01:35:55 +0000
+++ breezy/tests/test_repository.py	2017-05-30 21:16:02 +0000
@@ -31,7 +31,6 @@
     )
 from breezy import (
     btree_index,
-    symbol_versioning,
     tests,
     transport,
     vf_search,
 
=== modified file 'breezy/tests/test_revisionspec.py'
--- breezy/tests/test_revisionspec.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_revisionspec.py	2017-05-30 21:16:02 +0000
@@ -20,7 +20,6 @@
 from breezy import (
     errors,
     revision as _mod_revision,
-    symbol_versioning,
     )
 from breezy.tests import TestCaseWithTransport
 from breezy.revisionspec import (
@@ -115,18 +114,6 @@
 
 class TestRevisionSpecBase(TestRevisionSpec):
 
-    def test_wants_revision_history(self):
-        # If wants_revision_history = True, then _match_on should get the
-        # branch revision history
-        spec = RevisionSpecMatchOnTrap('foo', _internal=True)
-        spec.wants_revision_history = True
-        self.callDeprecated(['RevisionSpec.wants_revision_history was '
-            'deprecated in 2.5 (RevisionSpecMatchOnTrap).'],
-            spec.in_history, self.tree.branch)
-
-        self.assertEqual((self.tree.branch, ['r1' ,'r2']),
-                         spec.last_call)
-
     def test_wants_no_revision_history(self):
         # If wants_revision_history = False, then _match_on should get None for
         # the branch revision history
 
=== modified file 'breezy/tests/test_selftest.py'
--- breezy/tests/test_selftest.py	2017-05-23 14:08:03 +0000
+++ breezy/tests/test_selftest.py	2017-05-30 21:16:02 +0000
@@ -539,19 +539,6 @@
         self.assertRaises(AssertionError, self.assertEqualStat,
             os.lstat("foo"), os.lstat("longname"))
 
-    def test_failUnlessExists(self):
-        """Deprecated failUnlessExists and failIfExists"""
-        self.applyDeprecated(
-            deprecated_in((2, 4)),
-            self.failUnlessExists, '.')
-        self.build_tree(['foo/', 'foo/bar'])
-        self.applyDeprecated(
-            deprecated_in((2, 4)),
-            self.failUnlessExists, 'foo/bar')
-        self.applyDeprecated(
-            deprecated_in((2, 4)),
-            self.failIfExists, 'foo/foo')
-
     def test_assertPathExists(self):
         self.assertPathExists('.')
         self.build_tree(['foo/', 'foo/bar'])
 
=== modified file 'breezy/tests/test_smart_add.py'
--- breezy/tests/test_smart_add.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_smart_add.py	2017-05-30 21:16:02 +0000
@@ -16,6 +16,7 @@
 
 from .. import (
     add,
+    cache_utf8,
     inventory,
     osutils,
     tests,
@@ -30,9 +31,7 @@
     def __call__(self, inv, parent_ie, path, kind):
         # The first part just logs if appropriate
         # Now generate a custom id
-        file_id = osutils.safe_file_id(kind + '-'
-                                       + path.replace('/', '%'),
-                                       warn=False)
+        file_id = cache_utf8.encode(kind + '-' + path.replace('/', '%'))
         if self.should_print:
             self._to_file.write('added %s with id %s\n'
                                 % (path, file_id))
 
=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_transform.py	2017-05-30 21:16:02 +0000
@@ -27,7 +27,6 @@
     osutils,
     revision as _mod_revision,
     rules,
-    symbol_versioning,
     tests,
     trace,
     transform,
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2017-05-25 01:35:55 +0000
+++ breezy/transform.py	2017-05-30 21:16:02 +0000
@@ -61,11 +61,6 @@
     splitpath,
     )
 from .progress import ProgressPhase
-from .symbol_versioning import (
-    deprecated_function,
-    deprecated_in,
-    deprecated_method,
-    )
 
 
 ROOT_PARENT = "root-parent"
@@ -2051,12 +2046,6 @@
         pass
 
     @property
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def inventory(self):
-        """This Tree does not use inventory as its backing data."""
-        raise NotImplementedError(_PreviewTree.inventory)
-
-    @property
     def root_inventory(self):
         """This Tree does not use inventory as its backing data."""
         raise NotImplementedError(_PreviewTree.root_inventory)
 
=== modified file 'breezy/transport/__init__.py'
--- breezy/transport/__init__.py	2017-05-25 01:35:55 +0000
+++ breezy/transport/__init__.py	2017-05-30 21:16:02 +0000
@@ -38,7 +38,6 @@
 from breezy import (
     errors,
     osutils,
-    symbol_versioning,
     ui,
     urlutils,
     )
@@ -48,9 +47,6 @@
     BytesIO,
     string_types,
     )
-from ..symbol_versioning import (
-    DEPRECATED_PARAMETER,
-    )
 from ..trace import (
     mutter,
     )
@@ -922,15 +918,7 @@
                      None means just use the default.
         :return: The length of the file that was written.
         """
-        # We would like to mark this as NotImplemented, but most likely
-        # transports have defined it in terms of the old api.
-        symbol_versioning.warn('Transport %s should implement put_file,'
-                               ' rather than implementing put() as of'
-                               ' version 0.11.'
-                               % (self.__class__.__name__,),
-                               DeprecationWarning)
-        return self.put(relpath, f, mode=mode)
-        #raise NotImplementedError(self.put_file)
+        raise NotImplementedError(self.put_file)
 
     def put_file_non_atomic(self, relpath, f, mode=None,
                             create_parent_dir=False,
@@ -1001,12 +989,7 @@
 
         :returns: the length of relpath before the content was written to it.
         """
-        symbol_versioning.warn('Transport %s should implement append_file,'
-                               ' rather than implementing append() as of'
-                               ' version 0.11.'
-                               % (self.__class__.__name__,),
-                               DeprecationWarning)
-        return self.append(relpath, f, mode=mode)
+        raise NotImplementedError(self.append_file)
 
     def append_bytes(self, relpath, bytes, mode=None):
         """Append bytes to a file at relpath.
 
=== modified file 'breezy/transport/ftp/__init__.py'
--- breezy/transport/ftp/__init__.py	2017-05-22 00:56:52 +0000
+++ breezy/transport/ftp/__init__.py	2017-05-30 21:16:02 +0000
@@ -44,12 +44,6 @@
 from ...sixish import (
     BytesIO,
     )
-from ...symbol_versioning import (
-    DEPRECATED_PARAMETER,
-    deprecated_in,
-    deprecated_passed,
-    warn,
-    )
 from ...trace import mutter, warning
 from ...transport import (
     AppendBasedFileStream,
 
=== modified file 'breezy/transport/gio_transport.py'
--- breezy/transport/gio_transport.py	2017-05-22 00:56:52 +0000
+++ breezy/transport/gio_transport.py	2017-05-30 21:16:02 +0000
@@ -43,12 +43,6 @@
 from ..sixish import (
     BytesIO,
     )
-from ..symbol_versioning import (
-    DEPRECATED_PARAMETER,
-    deprecated_in,
-    deprecated_passed,
-    warn,
-    )
 from ..trace import mutter
 from . import (
     FileStream,
 
=== modified file 'breezy/transport/local.py'
--- breezy/transport/local.py	2017-05-22 00:56:52 +0000
+++ breezy/transport/local.py	2017-05-30 21:16:02 +0000
@@ -34,7 +34,6 @@
     atomicfile,
     osutils,
     urlutils,
-    symbol_versioning,
     )
 from breezy.transport import LateReadError
 """)
 
=== modified file 'breezy/tree.py'
--- breezy/tree.py	2017-05-25 01:35:55 +0000
+++ breezy/tree.py	2017-05-30 21:16:02 +0000
@@ -42,10 +42,6 @@
 
 from .decorators import needs_read_lock
 from .inter import InterObject
-from .symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 
 
 class Tree(object):
@@ -138,10 +134,6 @@
     def has_id(self, file_id):
         raise NotImplementedError(self.has_id)
 
-    @deprecated_method(deprecated_in((2, 4, 0)))
-    def __contains__(self, file_id):
-        return self.has_id(file_id)
-
     def has_or_had_id(self, file_id):
         raise NotImplementedError(self.has_or_had_id)
 
@@ -781,13 +773,6 @@
             yield cur_path
         # all done.
 
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def _get_inventory(self):
-        return self._inventory
-
-    inventory = property(_get_inventory,
-                         doc="Inventory of this Tree")
-
     def _get_root_inventory(self):
         return self._inventory
 
@@ -839,10 +824,6 @@
     def all_file_ids(self):
         return {entry.file_id for path, entry in self.iter_entries_by_dir()}
 
-    @deprecated_method(deprecated_in((2, 4, 0)))
-    def __iter__(self):
-        return iter(self.all_file_ids())
-
     def filter_unversioned_files(self, paths):
         """Filter out paths that are versioned.
 
@@ -885,10 +866,6 @@
         inv, inv_file_id = self._unpack_file_id(file_id)
         return inv[inv_file_id].children.itervalues()
 
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def get_file_by_path(self, path):
-        return self.get_file(self.path2id(path), path)
-
     def iter_children(self, file_id, path=None):
         """See Tree.iter_children."""
         entry = self.iter_entries_by_dir([file_id]).next()[1]
 
=== modified file 'breezy/vf_repository.py'
--- breezy/vf_repository.py	2017-05-25 01:35:55 +0000
+++ breezy/vf_repository.py	2017-05-30 21:16:02 +0000
@@ -37,7 +37,6 @@
     revision as _mod_revision,
     serializer as _mod_serializer,
     static_tuple,
-    symbol_versioning,
     tsort,
     ui,
     versionedfile,
@@ -2643,13 +2642,10 @@
 
     @needs_read_lock
     def search_missing_revision_ids(self,
-            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
             find_ghosts=True, revision_ids=None, if_present_ids=None,
             limit=None):
         """Return the revision ids that source has that target does not.
 
-        :param revision_id: only return revision ids included by this
-            revision_id.
         :param revision_ids: return revision ids included by these
             revision_ids.  NoSuchRevision will be raised if any of these
             revisions are not present.
@@ -2661,17 +2657,6 @@
             rather than just finding the surface difference.
         :return: A breezy.graph.SearchResult.
         """
-        if symbol_versioning.deprecated_passed(revision_id):
-            symbol_versioning.warn(
-                'search_missing_revision_ids(revision_id=...) was '
-                'deprecated in 2.4.  Use revision_ids=[...] instead.',
-                DeprecationWarning, stacklevel=2)
-            if revision_ids is not None:
-                raise AssertionError(
-                    'revision_ids is mutually exclusive with revision_id')
-            if revision_id is not None:
-                revision_ids = [revision_id]
-        del revision_id
         # stop searching at found target revisions.
         if not find_ghosts and (revision_ids is not None or if_present_ids is
                 not None):
 
=== modified file 'breezy/weave.py'
--- breezy/weave.py	2017-05-24 19:44:00 +0000
+++ breezy/weave.py	2017-05-30 21:16:02 +0000
@@ -88,7 +88,6 @@
 from .sixish import (
     BytesIO,
     )
-from .symbol_versioning import *
 from .trace import mutter
 from .versionedfile import (
     AbsentContentFactory,
 
=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2017-05-25 01:35:55 +0000
+++ breezy/workingtree.py	2017-05-30 21:16:02 +0000
@@ -48,6 +48,7 @@
 
 from breezy import (
     branch,
+    cache_utf8,
     conflicts as _mod_conflicts,
     controldir,
     errors,
@@ -76,7 +77,6 @@
 from . import (
     bzrdir,
     osutils,
-    symbol_versioning,
     )
 from .decorators import needs_read_lock, needs_write_lock
 from .i18n import gettext
@@ -97,10 +97,6 @@
     BytesIO,
     )
 from .trace import mutter, note
-from .symbol_versioning import (
-    deprecated_passed,
-    DEPRECATED_PARAMETER,
-    )
 
 
 MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
@@ -180,7 +176,7 @@
         return views.DisabledViews(self)
 
     def __init__(self, basedir='.',
-                 branch=DEPRECATED_PARAMETER,
+                 branch=None,
                  _internal=False,
                  _transport=None,
                  _format=None,
@@ -196,7 +192,7 @@
                 "WorkingTree.open() to obtain a WorkingTree.")
         basedir = safe_unicode(basedir)
         mutter("opening working tree %r", basedir)
-        if deprecated_passed(branch):
+        if branch is not None:
             self._branch = branch
         else:
             self._branch = self.bzrdir.open_branch()
@@ -1787,7 +1783,7 @@
     """
 
     def __init__(self, basedir='.',
-                 branch=DEPRECATED_PARAMETER,
+                 branch=None,
                  _inventory=None,
                  _control_files=None,
                  _internal=False,
@@ -2376,7 +2372,7 @@
                 raise errors.MergeModifiedFormatError()
             for s in _mod_rio.RioReader(hashfile):
                 # RioReader reads in Unicode, so convert file_ids back to utf8
-                file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
+                file_id = cache_utf8.encode(s.get("file_id"))
                 if not self.has_id(file_id):
                     continue
                 text_hash = s.get("hash")
 
=== modified file 'breezy/workingtree_4.py'
--- breezy/workingtree_4.py	2017-05-25 01:35:55 +0000
+++ breezy/workingtree_4.py	2017-05-30 21:16:02 +0000
@@ -72,10 +72,6 @@
 from .sixish import (
     BytesIO,
     )
-from .symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 from .transport.local import LocalTransport
 from .tree import (
     InterTree,
@@ -433,13 +429,6 @@
         self._generate_inventory()
         return self._inventory
 
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def _get_inventory(self):
-        return self.root_inventory
-
-    inventory = property(_get_inventory,
-                         doc="Inventory of this Tree")
-
     root_inventory = property(_get_root_inventory,
         "Root inventory of this tree")
 
@@ -1951,13 +1940,6 @@
     root_inventory = property(_get_root_inventory,
                          doc="Inventory of this Tree")
 
-    @deprecated_method(deprecated_in((2, 5, 0)))
-    def _get_inventory(self):
-        return self.root_inventory
-
-    inventory = property(_get_inventory,
-                         doc="Inventory of this Tree")
-
     def get_parent_ids(self):
         """The parents of a tree in the dirstate are not cached."""
         return self._repository.get_revision(self._revision_id).parent_ids
 
=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2017-05-24 20:47:06 +0000
+++ doc/en/release-notes/brz-3.0.txt	2017-05-30 21:16:02 +0000
@@ -55,6 +55,9 @@
  * Signature of ``load_tests`` used by ``TestLoader`` changed to be
    compatible with standard libarary unittest.  (Martin Packman)
 
+ * All previously deprecated functionality has been removed.
+   (Jelmer Vernooij)
+
  * Renamed ``breezy.delta.report_delta`` parameter ``filter=`` to
    ``predicate=``. (Martin Packman)