← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-27 00:22:26 UTC
  • mfrom: (5904.1.2 cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20110527002226-47nfzevxy52b4pn1
(vila) Fix some imports and other pyflakes failures. (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
44
44
    rename_map,
45
45
    revision as _mod_revision,
46
46
    static_tuple,
47
 
    symbol_versioning,
48
47
    timestamp,
49
48
    transport,
50
49
    ui,
72
71
    _parse_revision_str,
73
72
    )
74
73
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
 
74
from bzrlib import (
 
75
    symbol_versioning,
 
76
    )
75
77
 
76
78
 
77
79
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
3646
3648
        if typestring == "sftp":
3647
3649
            from bzrlib.tests import stub_sftp
3648
3650
            return stub_sftp.SFTPAbsoluteServer
3649
 
        if typestring == "memory":
 
3651
        elif typestring == "memory":
3650
3652
            from bzrlib.tests import test_server
3651
3653
            return memory.MemoryServer
3652
 
        if typestring == "fakenfs":
 
3654
        elif typestring == "fakenfs":
3653
3655
            from bzrlib.tests import test_server
3654
3656
            return test_server.FakeNFSServer
3655
3657
        msg = "No known transport type %s. Supported types are: sftp\n" %\
5636
5638
            unstacked=None):
5637
5639
        directory = bzrdir.BzrDir.open(location)
5638
5640
        if stacked_on and unstacked:
5639
 
            raise BzrCommandError("Can't use both --stacked-on and --unstacked")
 
5641
            raise errors.BzrCommandError("Can't use both --stacked-on and --unstacked")
5640
5642
        elif stacked_on is not None:
5641
5643
            reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5642
5644
        elif unstacked: