diff options
author | Scott Maxwell <scott@codecobblers.com> | 2013-10-31 10:01:21 -0700 |
---|---|---|
committer | Scott Maxwell <scott@codecobblers.com> | 2013-10-31 10:01:21 -0700 |
commit | fcf56ff9f85653e48db929b4a60460beabad24de (patch) | |
tree | 2fd84de53a9cb45f7f9d06f3b07b6d464f002fb2 /paramiko/buffered_pipe.py | |
parent | e4e1dc2002d8a0bea1ccb28fa43d5cd5accf5520 (diff) | |
download | paramiko-fcf56ff9f85653e48db929b4a60460beabad24de.tar.gz |
Fix bytes/str type in more places
Diffstat (limited to 'paramiko/buffered_pipe.py')
-rw-r--r-- | paramiko/buffered_pipe.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/buffered_pipe.py b/paramiko/buffered_pipe.py index 4ef5cf74..0391dee9 100644 --- a/paramiko/buffered_pipe.py +++ b/paramiko/buffered_pipe.py @@ -25,6 +25,7 @@ read operations are blocking and can have a timeout set. import array import threading import time +from paramiko.common import * class PipeTimeout (IOError): @@ -121,7 +122,7 @@ class BufferedPipe (object): @raise PipeTimeout: if a timeout was specified and no data was ready before that timeout """ - out = '' + out = bytes() self._lock.acquire() try: if len(self._buffer) == 0: |