summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-09-27 21:16:10 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-09-27 21:16:10 -0700
commit65271c65d220fd9a745a7040064826d4c168187b (patch)
tree3f53e3369acade5f001b18490e2a4e88e8e9e361
parent68cad65bb2f245e29476003493e86a7d8a801df5 (diff)
parent57046f44cb4ba3c9aec6f36eed2d8f3032730871 (diff)
Merge branch '1.10' into 1.11
-rw-r--r--NEWS2
-rwxr-xr-xdemos/demo_simple.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1649d5eb..e9ca6f1d 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,8 @@ v1.10.4 (27th Sep 2013)
* #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
& 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)
-----------------------
diff --git a/demos/demo_simple.py b/demos/demo_simple.py
index 231da8df..a1a90e8d 100755
--- a/demos/demo_simple.py
+++ b/demos/demo_simple.py
@@ -63,7 +63,7 @@ password = getpass.getpass('Password for %s@%s: ' % (username, hostname))
try:
client = paramiko.SSHClient()
client.load_system_host_keys()
- client.set_missing_host_key_policy(paramiko.WarningPolicy)
+ client.set_missing_host_key_policy(paramiko.WarningPolicy())
print '*** Connecting...'
client.connect(hostname, port, username, password)
chan = client.invoke_shell()