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 | 8a563e44d42731143f4356edcad0d7469a56ea24 (patch) | |
| tree | 4641e9608e76b130ea6afe467a30202494ef0eeb /paramiko/channel.py | |
| parent | bbf74c0dbf66c463bd68bd30abcd338796152354 (diff) | |
| parent | 31b2fd0709f259961253b9cdc875ce7827abaa68 (diff) | |
| download | python-paramiko-8a563e44d42731143f4356edcad0d7469a56ea24.tar python-paramiko-8a563e44d42731143f4356edcad0d7469a56ea24.tar.gz | |
Merge tag 'upstream/1.16.0'
Upstream version 1.16.0
Diffstat (limited to 'paramiko/channel.py')
| -rw-r--r-- | paramiko/channel.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py index 7e39a15..057b417 100644 --- a/paramiko/channel.py +++ b/paramiko/channel.py @@ -587,7 +587,7 @@ class Channel (ClosingContextManager): is returned, the channel stream has closed. :param int nbytes: maximum number of bytes to read. - :return: received data, as a `str` + :return: received data, as a `bytes` :raises socket.timeout: if no data is ready before the timeout set by `settimeout`. @@ -975,7 +975,7 @@ class Channel (ClosingContextManager): else: ok = server.check_channel_env_request(self, name, value) elif key == 'exec': - cmd = m.get_text() + cmd = m.get_string() if server is None: ok = False else: |