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

Merge branch '1.10' into 1.11

This commit is contained in:
Jeff Forcier 2013-09-27 21:16:10 -07:00
parent 68cad65bb2 57046f44cb
commit 65271c65d2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -25,6 +25,8 @@ v1.10.4 (27th Sep 2013)
* #179: Fix a missing variable causing errors when an ssh_config file has a * #179: Fix a missing variable causing errors when an ssh_config file has a
non-default AddressFamily set. Thanks to Ed Marshall & Tomaz Muraus for catch non-default AddressFamily set. Thanks to Ed Marshall & Tomaz Muraus for catch
& patch. & patch.
* #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex
Buchanan for catch & Dave Foster for patch.
v1.11.1 (20th Sep 2013) v1.11.1 (20th Sep 2013)
----------------------- -----------------------

2
demos/demo_simple.py
View File

@ -63,7 +63,7 @@ password = getpass.getpass('Password for %s@%s: ' % (username, hostname))
try: try:
client = paramiko.SSHClient() client = paramiko.SSHClient()
client.load_system_host_keys() client.load_system_host_keys()
client.set_missing_host_key_policy(paramiko.WarningPolicy) client.set_missing_host_key_policy(paramiko.WarningPolicy())
print '*** Connecting...' print '*** Connecting...'
client.connect(hostname, port, username, password) client.connect(hostname, port, username, password)
chan = client.invoke_shell() chan = client.invoke_shell()