More type conversion

3 files changed, 11 insertions, 9 deletions

diff --git a/tests/loop.py b/tests/loop.py
index cfd76265..b2c73ddf 100644
--- a/tests/loop.py
+++ b/tests/loop.py
@@ -21,7 +21,7 @@
 """
 
 import threading, socket
-from paramiko.py3compat import *
+from paramiko.common import *
 
 
 class LoopSocket (object):
@@ -47,6 +47,7 @@ class LoopSocket (object):
             self.__lock.release()
 
     def send(self, data):
+        data = asbytes(data)
         if self.__mate is None:
             # EOF
             raise EOFError()
diff --git a/tests/test_client.py b/tests/test_client.py
index 0959ac9a..a8d04630 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -29,6 +29,7 @@ import weakref
 from binascii import hexlify
 from tests.util import test_path
 import paramiko
+from paramiko.py3compat import b
 
 
 class NullServer (paramiko.ServerInterface):
@@ -44,7 +45,7 @@ class NullServer (paramiko.ServerInterface):
         return paramiko.AUTH_FAILED
 
     def check_auth_publickey(self, username, key):
-        if (key.get_name() == 'ssh-dss') and (hexlify(key.get_fingerprint()) == '4478f0b9a23cc5182009ff755bc1d26c'):
+        if (key.get_name() == 'ssh-dss') and (hexlify(key.get_fingerprint()) == b('4478f0b9a23cc5182009ff755bc1d26c')):
             return paramiko.AUTH_SUCCESSFUL
         return paramiko.AUTH_FAILED
 
diff --git a/tests/test_transport.py b/tests/test_transport.py
index ccd44e47..230f4a28 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -362,7 +362,7 @@ class TransportTest(ParamikoTest):
         self.assertEquals([], w)
         self.assertEquals([], e)
 
-        self.assertEquals('hello\n', chan.recv(6))
+        self.assertEquals(b('hello\n'), chan.recv(6))
         
         # and, should be dead again now
         r, w, e = select.select([chan], [], [], 0.1)
@@ -381,7 +381,7 @@ class TransportTest(ParamikoTest):
         self.assertEquals([chan], r)
         self.assertEquals([], w)
         self.assertEquals([], e)
-        self.assertEquals('', chan.recv(16))
+        self.assertEquals(bytes(), chan.recv(16))
         
         # make sure the pipe is still open for now...
         p = chan._pipe
@@ -463,7 +463,7 @@ class TransportTest(ParamikoTest):
         self.assertEquals(6093, requested[0][1])
         
         x11_server.send('hello')
-        self.assertEquals('hello', x11_client.recv(5))
+        self.assertEquals(b('hello'), x11_client.recv(5))
         
         x11_server.close()
         x11_client.close()
@@ -496,7 +496,7 @@ class TransportTest(ParamikoTest):
         cch = self.tc.accept()
         
         sch.send('hello')
-        self.assertEquals('hello', cch.recv(5))
+        self.assertEquals(b('hello'), cch.recv(5))
         sch.close()
         cch.close()
         ss.close()
@@ -528,12 +528,12 @@ class TransportTest(ParamikoTest):
         cch.connect(self.server._tcpip_dest)
         
         ss, _ = greeting_server.accept()
-        ss.send('Hello!\n')
+        ss.send(b('Hello!\n'))
         ss.close()
         sch.send(cch.recv(8192))
         sch.close()
         
-        self.assertEquals('Hello!\n', cs.recv(7))
+        self.assertEquals(b('Hello!\n'), cs.recv(7))
         cs.close()
 
     def test_G_stderr_select(self):
@@ -564,7 +564,7 @@ class TransportTest(ParamikoTest):
         self.assertEquals([], w)
         self.assertEquals([], e)
 
-        self.assertEquals('hello\n', chan.recv_stderr(6))
+        self.assertEquals(b('hello\n'), chan.recv_stderr(6))
         
         # and, should be dead again now
         r, w, e = select.select([chan], [], [], 0.1)