← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/remote.py

(igc) Desktop Guide link

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/remote.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
435
435
        remote._translate_error(err, path=relpath)
436
436
 
437
437
    def disconnect(self):
438
 
        m = self.get_smart_medium()
439
 
        if m is not None:
440
 
            m.disconnect()
 
438
        self.get_smart_medium().disconnect()
441
439
 
442
440
    def stat(self, relpath):
443
441
        resp = self._call2('stat', self._remote_path(relpath))
516
514
        if user is None:
517
515
            auth = config.AuthenticationConfig()
518
516
            user = auth.get_user('ssh', self._host, self._port)
519
 
        ssh_params = medium.SSHParams(self._host, self._port, user,
520
 
            self._password, bzr_remote_path)
521
 
        client_medium = medium.SmartSSHClientMedium(self.base, ssh_params)
 
517
        client_medium = medium.SmartSSHClientMedium(self._host, self._port,
 
518
            user, self._password, self.base,
 
519
            bzr_remote_path=bzr_remote_path)
522
520
        return client_medium, (user, self._password)
523
521
 
524
522
 
603
601
    """Return (transport, server) permutations for testing."""
604
602
    ### We may need a little more test framework support to construct an
605
603
    ### appropriate RemoteTransport in the future.
606
 
    from bzrlib.tests import test_server
607
 
    return [(RemoteTCPTransport, test_server.SmartTCPServer_for_testing)]
 
604
    from bzrlib.smart import server
 
605
    return [(RemoteTCPTransport, server.SmartTCPServer_for_testing)]