dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.10' 

Conflicts:
	NEWS
This commit is contained in:
Jeff Forcier 2013-04-27 22:15:07 -07:00
parent f861c2ff48 3966ac103c
commit a1fa1ba9cc
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -29,6 +29,12 @@ v1.11.0 (DD MM YYYY)
against duplicate entries during subsequent `known_hosts` loads.) Thanks to against duplicate entries during subsequent `known_hosts` loads.) Thanks to
`@sunweaver` for the contribution. `@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) v1.10.1 (5th Apr 2013)
---------------------- ----------------------

10
paramiko/agent.py
View File

@ -255,11 +255,11 @@ class AgentServerProxy(AgentSSH):
self.close() self.close()
def connect(self): def connect(self):
conn_sock = self.__t.open_forward_agent_channel() conn_sock = self.__t.open_forward_agent_channel()
if conn_sock is None: if conn_sock is None:
raise SSHException('lost ssh-agent') raise SSHException('lost ssh-agent')
conn_sock.set_name('auth-agent') conn_sock.set_name('auth-agent')
self._connect(conn_sock) self._connect(conn_sock)
def close(self): def close(self):
""" """

4
paramiko/config.py
View File

@ -135,7 +135,7 @@ class SSHConfig (object):
else: else:
host['config']['identityfile'] = [value] host['config']['identityfile'] = [value]
elif key not in host['config']: elif key not in host['config']:
host['config'].update({key: value}) host['config'].update({key: value})
self._config.append(host) self._config.append(host)
def lookup(self, hostname): def lookup(self, hostname):
@ -252,5 +252,5 @@ class SSHConfig (object):
config[k][item] = config[k][item].\ config[k][item] = config[k][item].\
replace(find, str(replace)) replace(find, str(replace))
else: else:
config[k] = config[k].replace(find, str(replace)) config[k] = config[k].replace(find, str(replace))
return config return config

2
paramiko/transport.py
View File

@ -1439,7 +1439,7 @@ class Transport (threading.Thread):
break break
self.clear_to_send_lock.release() self.clear_to_send_lock.release()
if time.time() > start + self.clear_to_send_timeout: 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: try:
self._send_message(data) self._send_message(data)
finally: finally: