From e6c23f23f4e6b8e6eb577d9b486dc21114b5a398 Mon Sep 17 00:00:00 2001 From: Abhinav Upadhyay Date: Sat, 9 Mar 2013 00:09:20 +0530 Subject: [PATCH 1/2] Fix indentation at few places. --- paramiko/agent.py | 10 +++++----- paramiko/config.py | 4 ++-- paramiko/transport.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/paramiko/agent.py b/paramiko/agent.py index 1dd3063..d4ff703 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 e41bae4..31caf29 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 fd6dab7..201a253 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: From 3966ac103c988218be02371803817b66b4deab17 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Sat, 27 Apr 2013 22:12:24 -0700 Subject: [PATCH 2/2] Changelog re #146 (also start 10.10.2 section) --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 7a983ba..1bb2d37 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,12 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== +v1.10.2 (DD MM 2013) +-------------------- + +* #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch + & patch. + v1.10.1 (5th Apr 2013) ----------------------