Rev 2014: (spiv, jam) fallback to Paramiko if ssh is not available in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2014
revision-id: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
parent: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
parent: john at arbash-meinel.com-20060915222344-32f6da8f7538adc2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 00:39:42 +0100
message:
  (spiv,jam) fallback to Paramiko if ssh is not available
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060915222344-32f6da8f7538adc2
    parent: john at arbash-meinel.com-20060915221819-f3e636f08d2ea3f2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: fix-sftp-vendor
    timestamp: Fri 2006-09-15 17:23:44 -0500
    message:
      NEWS
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060915221819-f3e636f08d2ea3f2
    parent: john at arbash-meinel.com-20060915220519-e6d4da0d2a1f8791
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: fix-sftp-vendor
    timestamp: Fri 2006-09-15 17:18:19 -0500
    message:
      Add a test that we can always fall back to the paramiko vendor
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060915220519-e6d4da0d2a1f8791
    parent: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
    parent: andrew.bennetts at canonical.com-20060913124446-28405a99e41eae49
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: fix-sftp-vendor
    timestamp: Fri 2006-09-15 17:05:19 -0500
    message:
      [merge] Andrew Bennetts: fixes for _get_ssh_vendor()
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060913124446-28405a99e41eae49
    parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr-ssh-fixes
    timestamp: Wed 2006-09-13 22:44:46 +1000
    message:
      Fix NameError reported by Alexander Belchenko.
      
      This also fixes some other nits so that pyflakes now gives completely 
      clean output for sftp.py and ssh.py.