From 25da143c18e0ac6151043dd11ef2a5b7e5fa4271 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Sat, 29 Mar 2014 00:17:22 +0000
Subject: [PATCH] Use bytes for I/O, and encode any text.

---
 ts3/protocol.py | 12 ++++++------
 ts3/test.py     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ts3/protocol.py b/ts3/protocol.py
index 38c5c7c..a9ee8e1 100644
--- a/ts3/protocol.py
+++ b/ts3/protocol.py
@@ -104,9 +104,9 @@ class TS3Proto():
             self._timeout = timeout
             self._connected = False
 
-            data = self._telnet.read_until("\n\r", self._timeout)
+            data = self._telnet.read_until(b"\n\r", self._timeout)
 
-        if data.endswith("TS3\n\r"):
+        if data.endswith(b"TS3\n\r"):
             self._connected = True
 
         return self._connected
@@ -126,15 +126,15 @@ class TS3Proto():
         self.logger.debug("send_command - %s" % commandstr)
 
         with self.io_lock:
-            self._telnet.write("%s\n\r" % commandstr)
+            self._telnet.write(b"%s\n\r" % commandstr.encode('utf-8'))
 
-            data = ""
-            response = self._telnet.read_until("\n\r", self._timeout)
+            data = ''
+            response = self._telnet.read_until(b"\n\r", self._timeout)
 
         if not response.startswith("error"):
             # what we just got was extra data
             data = response
-            response = self._telnet.read_until("\n\r", self._timeout)
+            response = self._telnet.read_until(b"\n\r", self._timeout)
 
         return TS3Response(response, data)
 
diff --git a/ts3/test.py b/ts3/test.py
index 3cbc64a..d64bb11 100644
--- a/ts3/test.py
+++ b/ts3/test.py
@@ -84,7 +84,7 @@ def dummy_ts3(event, sock):
     event.set()
     try:
         conn, addr = sock.accept()
-        conn.send('TS3\n\r')
+        conn.send(b"TS3\n\r")
     except socket.timeout:
         pass
     finally: