diff options
author | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
commit | 31b2fd0709f259961253b9cdc875ce7827abaa68 (patch) | |
tree | 863b7f1fe851d7183419916248591537a4b8b6c5 /paramiko/buffered_pipe.py | |
parent | bf855e6da326dba0c46f005eedc9f390c6c3b206 (diff) | |
download | python-paramiko-31b2fd0709f259961253b9cdc875ce7827abaa68.tar python-paramiko-31b2fd0709f259961253b9cdc875ce7827abaa68.tar.gz |
Imported Upstream version 1.16.0upstream/1.16.0upstream
Diffstat (limited to 'paramiko/buffered_pipe.py')
-rw-r--r-- | paramiko/buffered_pipe.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/buffered_pipe.py b/paramiko/buffered_pipe.py index ac35b3e..d5fe164 100644 --- a/paramiko/buffered_pipe.py +++ b/paramiko/buffered_pipe.py @@ -81,7 +81,7 @@ class BufferedPipe (object): Feed new data into this pipe. This method is assumed to be called from a separate thread, so synchronization is done. - :param data: the data to add, as a `str` + :param data: the data to add, as a `str` or `bytes` """ self._lock.acquire() try: @@ -125,7 +125,7 @@ class BufferedPipe (object): :param int nbytes: maximum number of bytes to read :param float timeout: maximum seconds to wait (or ``None``, the default, to wait forever) - :return: the read data, as a `str` + :return: the read data, as a `bytes` :raises PipeTimeout: if a timeout was specified and no data was ready before that |