← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-03 20:26:39 UTC
  • mfrom: (3066.2.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20071203202639-842vhwu1asbujc95
(John Arbash Meinel) Simple cleanup around stale paramiko traps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
331
331
    register_ssh_vendor('paramiko', vendor)
332
332
    register_ssh_vendor('none', vendor)
333
333
    register_default_ssh_vendor(vendor)
 
334
    _sftp_connection_errors = (EOFError, paramiko.SSHException)
334
335
    del vendor
 
336
else:
 
337
    _sftp_connection_errors = (EOFError,)
335
338
 
336
339
 
337
340
class SubprocessVendor(SSHVendor):
350
353
                                                  subsystem='sftp')
351
354
            sock = self._connect(argv)
352
355
            return SFTPClient(sock)
353
 
        except (EOFError, paramiko.SSHException), e:
 
356
        except _sftp_connection_errors, e:
354
357
            self._raise_connection_error(host, port=port, orig_error=e)
355
358
        except (OSError, IOError), e:
356
359
            # If the machine is fast enough, ssh can actually exit