summaryrefslogtreecommitdiff
path: root/paramiko/pipe.py
diff options
context:
space:
mode:
authorSebastian Deiss <s.deiss@science-computing.de>2014-02-11 13:01:49 +0100
committerSebastian Deiss <s.deiss@science-computing.de>2014-02-11 13:01:49 +0100
commite7f41de2f2dac5d03404f35edc5514f12e42c49f (patch)
treeeae66247e741b2acdcc5ec10712af231992296a0 /paramiko/pipe.py
parenta08ac06083a40eb1455e5fa14cd644f7a2350f16 (diff)
downloadparamiko-e7f41de2f2dac5d03404f35edc5514f12e42c49f.tar.gz
Merge branch scottkmaxwell:py3-support-without-py25 into
SebastianDeiss:gssapi-py3-support
Diffstat (limited to 'paramiko/pipe.py')
-rw-r--r--paramiko/pipe.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/paramiko/pipe.py b/paramiko/pipe.py
index db43d549..619b807e 100644
--- a/paramiko/pipe.py
+++ b/paramiko/pipe.py
@@ -27,6 +27,7 @@ will trigger as readable in select().
import sys
import os
import socket
+from paramiko.py3compat import b
def make_pipe ():
@@ -63,7 +64,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
@@ -109,7 +110,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