nikdoof/python-ts3
1
0
Fork 0
mirror of https://github.com/nikdoof/python-ts3.git synced 2025-12-17 03:49:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use bytes for I/O, and encode any text.

Browse Source
This commit is contained in:
Andrew Williams
2014-03-29 00:17:22 +00:00
parent c03dba92e5
commit 25da143c18
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ts3/protocol.py
View File

@@ -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)