← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

  • Committer: Martin Pool
  • Date: 2007-04-04 01:22:11 UTC
  • mfrom: (2393.1.1 bzr.docs)
  • mto: This revision was merged to the branch mainline in revision 2397.
  • Revision ID: mbp@sourcefrog.net-20070404012211-sq269me6bai9m6xk
merge trunk and doc fix from elliot

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
56
56
    ssh,
57
57
    Transport,
58
58
    )
 
59
from bzrlib.transport.local import LocalURLServer
59
60
 
60
61
try:
61
62
    import paramiko
1068
1069
        ssh_server.start_server(event, server)
1069
1070
        event.wait(5.0)
1070
1071
    
1071
 
    def setUp(self):
 
1072
    def setUp(self, vfs_server=None):
 
1073
        # XXX: TODO: make sftpserver back onto vfs_server rather than local disk.
 
1074
        assert vfs_server is None or isinstance(vfs_server, LocalURLServer), \
 
1075
            "SFTPServer currently assumes local transport, got %s" % vfs_server
1072
1076
        self._original_vendor = ssh._ssh_vendor_manager._cached_ssh_vendor
1073
1077
        ssh._ssh_vendor_manager._cached_ssh_vendor = self._vendor
1074
1078
        if sys.platform == 'win32':