summaryrefslogtreecommitdiffhomepage
path: root/demos/interactive.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-06 16:07:24 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-06 16:07:24 -0700
commit08239ff4b29c0b53c5443f21ae482e51340223f6 (patch)
tree73f0b7e4d25a80c965186d03abde9c006b1feec0 /demos/interactive.py
parent5335d9dc0a6266217d288e7aaf2091739980d841 (diff)
parent6a6ac4d78421667b810f5e3a017fb669853133f9 (diff)
Merge branch 'master' into 234-int
Diffstat (limited to 'demos/interactive.py')
-rw-r--r--demos/interactive.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/demos/interactive.py b/demos/interactive.py
index f3be74d2..7138cd6c 100644
--- a/demos/interactive.py
+++ b/demos/interactive.py
@@ -19,6 +19,7 @@
import socket
import sys
+from paramiko.py3compat import u
# windows does not have termios...
try:
@@ -49,9 +50,9 @@ def posix_shell(chan):
r, w, e = select.select([chan, sys.stdin], [], [])
if chan in r:
try:
- x = chan.recv(1024)
+ x = u(chan.recv(1024))
if len(x) == 0:
- print '\r\n*** EOF\r\n',
+ sys.stdout.write('\r\n*** EOF\r\n')
break
sys.stdout.write(x)
sys.stdout.flush()