diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-05 17:03:37 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-05 17:03:37 -0800 |
| commit | b2be63ec623b5944f9b84cac8b8f41aeb2b42fb7 (patch) | |
| tree | 389e17b0c08cd34872a2e3afbc34860ab44fb3ed /paramiko/pipe.py | |
| parent | bd61c7c0a9a4a2020d0acfb6a01e9ec85bb43b8e (diff) | |
| parent | ae078f51d622931954e47e78029a889c4e721a05 (diff) | |
| download | paramiko-b2be63ec623b5944f9b84cac8b8f41aeb2b42fb7.tar.gz | |
Merge remote-tracking branch 'scottkmaxwell/py3-support-without-py25' into python3
Conflicts:
dev-requirements.txt
paramiko/__init__.py
paramiko/file.py
paramiko/hostkeys.py
paramiko/message.py
paramiko/proxy.py
paramiko/server.py
paramiko/transport.py
paramiko/util.py
paramiko/win_pageant.py
setup.py
Diffstat (limited to 'paramiko/pipe.py')
| -rw-r--r-- | paramiko/pipe.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/paramiko/pipe.py b/paramiko/pipe.py index 705f8d49..568aca6b 100644 --- a/paramiko/pipe.py +++ b/paramiko/pipe.py @@ -28,6 +28,7 @@ will trigger as readable in `select <select.select>`. import sys import os import socket +from paramiko.py3compat import b def make_pipe (): @@ -64,7 +65,7 @@ class PosixPipe (object): if self._set or self._closed: return self._set = True - os.write(self._wfd, '*') + os.write(self._wfd, b'*') def set_forever (self): self._forever = True @@ -110,7 +111,7 @@ class WindowsPipe (object): if self._set or self._closed: return self._set = True - self._wsock.send('*') + self._wsock.send(b'*') def set_forever (self): self._forever = True |