Rev 2257: Just import repository formats into repository.py, rather than using special delegate in file:///home/mbp/bzr/Work/repoformats/

[Martin Pool]

------------------------------------------------------------
revno: 2257
revision-id: mbp at sourcefrog.net-20070212065850-6i7a2btsua2b86tw
parent: mbp at sourcefrog.net-20070212063546-h2ku6z7fixzin6ur
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 17:58:50 +1100
message:
  Just import repository formats into repository.py, rather than using special delegate
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-02-12 06:35:46 +0000
+++ b/bzrlib/repository.py	2007-02-12 06:58:50 +0000
@@ -39,11 +39,26 @@
     transactions,
     ui,
     )
+from bzrlib.repofmt.knitrepo import(
+    KnitRepository,
+    KnitRepository2,
+    RepositoryFormatKnit,
+    RepositoryFormatKnit1,
+    RepositoryFormatKnit2,
+    )
+from bzrlib.repofmt.weaverepo import(
+    AllInOneRepository,
+    WeaveMetaDirRepository,
+    PreSplitOutRepositoryFormat,
+    RepositoryFormat4,
+    RepositoryFormat5,
+    RepositoryFormat6,
+    RepositoryFormat7,
+    )
 from bzrlib.revisiontree import RevisionTree
 from bzrlib.store.versioned import VersionedFileStore
 from bzrlib.store.text import TextStore
 from bzrlib.testament import Testament
-
 """)
 
 from bzrlib.decorators import needs_read_lock, needs_write_lock
@@ -768,41 +783,6 @@
 
 
 
-# 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)
-        m = __import__(from_module, globals(), locals(), [name])
-        try:
-            return getattr(m, name)
-        except AttributeError:
-            raise AttributeError('module %s has no name %s'
-                    % (m, 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',
-        'KnitRepository2',
-        'RepositoryFormatKnit',
-        'RepositoryFormatKnit1',
-        'RepositoryFormatKnit2',
-        ]:
-    __make_delegated(_name, 'bzrlib.repofmt.knitrepo')
-
-
 def install_revision(repository, rev, revision_tree):
     """Install all revision data into a repository."""
     present_parents = []