diff options
| -rw-r--r-- | paramiko/agent.py | 10 | ||||
| -rw-r--r-- | paramiko/config.py | 4 | ||||
| -rw-r--r-- | paramiko/transport.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/paramiko/agent.py b/paramiko/agent.py index 1dd30636..d4ff7036 100644 --- a/paramiko/agent.py +++ b/paramiko/agent.py @@ -255,11 +255,11 @@ class AgentServerProxy(AgentSSH): self.close() def connect(self): - conn_sock = self.__t.open_forward_agent_channel() - if conn_sock is None: - raise SSHException('lost ssh-agent') - conn_sock.set_name('auth-agent') - self._connect(conn_sock) + conn_sock = self.__t.open_forward_agent_channel() + if conn_sock is None: + raise SSHException('lost ssh-agent') + conn_sock.set_name('auth-agent') + self._connect(conn_sock) def close(self): """ diff --git a/paramiko/config.py b/paramiko/config.py index e41bae43..31caf29e 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -135,7 +135,7 @@ class SSHConfig (object): else: host['config']['identityfile'] = [value] elif key not in host['config']: - host['config'].update({key: value}) + host['config'].update({key: value}) self._config.append(host) def lookup(self, hostname): @@ -252,5 +252,5 @@ class SSHConfig (object): config[k][item] = config[k][item].\ replace(find, str(replace)) else: - config[k] = config[k].replace(find, str(replace)) + config[k] = config[k].replace(find, str(replace)) return config diff --git a/paramiko/transport.py b/paramiko/transport.py index fd6dab76..201a2531 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -1439,7 +1439,7 @@ class Transport (threading.Thread): break self.clear_to_send_lock.release() if time.time() > start + self.clear_to_send_timeout: - raise SSHException('Key-exchange timed out waiting for key negotiation') + raise SSHException('Key-exchange timed out waiting for key negotiation') try: self._send_message(data) finally: |