diff options
| author | Robey Pointer <robey@lag.net> | 2006-05-29 23:58:58 -0700 |
|---|---|---|
| committer | Robey Pointer <robey@lag.net> | 2006-05-29 23:58:58 -0700 |
| commit | 471876ff3e0cbd62e786303fce67fc5a0cc3a01c (patch) | |
| tree | 44c7e457c7327eeaf62924c8bfa05f502189a1ca | |
| parent | 0ad8405d159137655688781eea1e169e6b4083c4 (diff) | |
[project @ robey@lag.net-20060530065858-6300e2d76304778c]
convert an EOFError into SSHException during sftp negotation
| -rw-r--r-- | paramiko/sftp_client.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py index c5d5f399..07fe616a 100644 --- a/paramiko/sftp_client.py +++ b/paramiko/sftp_client.py @@ -61,6 +61,9 @@ class SFTPClient (BaseSFTP): @param sock: an open L{Channel} using the C{"sftp"} subsystem @type sock: L{Channel} + + @raise SSHException: if there's an exception while negotiating + sftp """ BaseSFTP.__init__(self) self.sock = sock @@ -77,7 +80,10 @@ class SFTPClient (BaseSFTP): self.logger = util.get_logger(transport.get_log_channel() + '.' + self.sock.get_name() + '.sftp') self.ultra_debug = transport.get_hexdump() - server_version = self._send_version() + try: + server_version = self._send_version() + except EOFError, x: + raise SSHException('EOF during negotiation') self._log(INFO, 'Opened sftp connection (server version %d)' % server_version) def from_transport(cls, t): |