diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-18 11:19:35 -0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-18 11:19:35 -0800 |
commit | b3884d2c44233f16cd334c4abcfddcf5e8bf8ef6 (patch) | |
tree | 107d26c33a7fb1428bda2ed5be9b9e2e09277c72 /demos/demo_server.py | |
parent | 37756f3a8892dbb41dfda74dcf37e21053bf4e34 (diff) | |
parent | 681f32583fe052c0516a2fda67e163169676ad11 (diff) |
Merge branch 'master' into switch-to-cryptography
Conflicts:
paramiko/ecdsakey.py
paramiko/util.py
Diffstat (limited to 'demos/demo_server.py')
-rw-r--r-- | demos/demo_server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/demo_server.py b/demos/demo_server.py index 5b3d5164..c4af9b10 100644 --- a/demos/demo_server.py +++ b/demos/demo_server.py @@ -159,7 +159,7 @@ try: print('Authenticated!') server.event.wait(10) - if not server.event.isSet(): + if not server.event.is_set(): print('*** Client never asked for a shell.') sys.exit(1) |