← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/__init__.py
28
28
    errors,
29
29
    tests,
30
30
    )
31
 
from bzrlib.branch import (BranchFormat,
32
 
                           _legacy_formats,
33
 
                           )
34
 
from bzrlib.remote import RemoteBranchFormat, RemoteBzrDirFormat
 
31
from bzrlib.branch import format_registry
 
32
from bzrlib.remote import RemoteBranchFormat
35
33
from bzrlib.tests import test_server
36
34
from bzrlib.tests.per_controldir.test_controldir import TestCaseWithControlDir
37
35
from bzrlib.transport import memory
132
130
    # Generate a list of branch formats and their associated bzrdir formats to
133
131
    # use.
134
132
    combinations = [(format, format._matchingbzrdir) for format in
135
 
         BranchFormat.get_formats() + _legacy_formats]
 
133
         format_registry._get_all()]
136
134
    scenarios = make_scenarios(
137
135
        # None here will cause the default vfs transport server to be used.
138
136
        None,