/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
still a little bit of breakage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
1
1
# Copyright (C) 2005 Robey Pointer <robey@lag.net>
2
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
1069
1069
        event.wait(5.0)
1070
1070
    
1071
1071
    def setUp(self):
1072
 
        self._original_vendor = ssh._ssh_vendor
1073
 
        ssh._ssh_vendor = self._vendor
 
1072
        self._original_vendor = ssh._ssh_vendor_manager._cached_ssh_vendor
 
1073
        ssh._ssh_vendor_manager._cached_ssh_vendor = self._vendor
1074
1074
        if sys.platform == 'win32':
1075
1075
            # Win32 needs to use the UNICODE api
1076
1076
            self._homedir = getcwd()
1089
1089
    def tearDown(self):
1090
1090
        """See bzrlib.transport.Server.tearDown."""
1091
1091
        self._listener.stop()
1092
 
        ssh._ssh_vendor = self._original_vendor
 
1092
        ssh._ssh_vendor_manager._cached_ssh_vendor = self._original_vendor
1093
1093
 
1094
1094
    def get_bogus_url(self):
1095
1095
        """See bzrlib.transport.Server.get_bogus_url."""