From fcf56ff9f85653e48db929b4a60460beabad24de Mon Sep 17 00:00:00 2001 From: Scott Maxwell Date: Thu, 31 Oct 2013 10:01:21 -0700 Subject: Fix bytes/str type in more places --- paramiko/buffered_pipe.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'paramiko/buffered_pipe.py') 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: -- cgit v1.2.1