summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-04-27 22:15:07 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-04-27 22:15:07 -0700
commita1fa1ba9cc2cf6cc65ffebb629da30333de84058 (patch)
tree086bd587277661ab5c9d9c1824d0ba4b246c3096
parentf861c2ff48f420b3be16f15bbf36c6ee3f779c38 (diff)
parent3966ac103c988218be02371803817b66b4deab17 (diff)
Merge branch '1.10'
Conflicts: NEWS
-rw-r--r--NEWS6
-rw-r--r--paramiko/agent.py10
-rw-r--r--paramiko/config.py4
-rw-r--r--paramiko/transport.py2
4 files changed, 14 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 2b498987..36a00220 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,12 @@ v1.11.0 (DD MM YYYY)
against duplicate entries during subsequent `known_hosts` loads.) Thanks to
`@sunweaver` for the contribution.
+v1.10.2 (DD MM 2013)
+--------------------
+
+* #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch
+ & patch.
+
v1.10.1 (5th Apr 2013)
----------------------
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: