Rev 5591: (vila) Remove backwards compatibility delegates deprecated since bzr 0.15. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Tue Jan 11 17:45:14 UTC 2011


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5591 [merge]
revision-id: pqm at pqm.ubuntu.com-20110111174511-6q6axq59ve3splyw
parent: pqm at pqm.ubuntu.com-20110111164125-mewywwom9048lihk
parent: jelmer at samba.org-20110111032839-0wetie0ncelxj3me
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-01-11 17:45:11 +0000
message:
  (vila) Remove backwards compatibility delegates deprecated since bzr 0.15.
   (Jelmer Vernooij)
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2010-12-02 10:41:05 +0000
+++ b/bzrlib/repository.py	2011-01-11 03:28:39 +0000
@@ -2822,39 +2822,6 @@
         raise NotImplementedError(self.revision_graph_can_have_wrong_parents)
 
 
-# remove these delegates a while after bzr 0.15
-def __make_delegated(name, from_module):
-    def _deprecated_repository_forwarder():
-        symbol_versioning.warn('%s moved to %s in bzr 0.15'
-            % (name, from_module),
-            DeprecationWarning,
-            stacklevel=2)
-        try:
-            return pyutils.get_named_object(from_module, name)
-        except AttributeError:
-            raise AttributeError('module %s has no name %s'
-                    % (sys.modules[from_module], name))
-    globals()[name] = _deprecated_repository_forwarder
-
-for _name in [
-        'AllInOneRepository',
-        'WeaveMetaDirRepository',
-        'PreSplitOutRepositoryFormat',
-        'RepositoryFormat4',
-        'RepositoryFormat5',
-        'RepositoryFormat6',
-        'RepositoryFormat7',
-        ]:
-    __make_delegated(_name, 'bzrlib.repofmt.weaverepo')
-
-for _name in [
-        'KnitRepository',
-        'RepositoryFormatKnit',
-        'RepositoryFormatKnit1',
-        ]:
-    __make_delegated(_name, 'bzrlib.repofmt.knitrepo')
-
-
 def install_revision(repository, rev, revision_tree):
     """Install all revision data into a repository."""
     install_revisions(repository, [(rev, revision_tree, None)])




More information about the bazaar-commits mailing list