From 5c4d7fb35e135393eb3aac8ccd2f1fe72217e72f Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Wed, 10 Sep 2014 21:34:08 +0200 Subject: [PATCH] Default charset is actually ISO-8859-1, not ascii. --- mcstatus/protocol/connection.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mcstatus/protocol/connection.py b/mcstatus/protocol/connection.py index d19aa99..f1492a8 100644 --- a/mcstatus/protocol/connection.py +++ b/mcstatus/protocol/connection.py @@ -66,13 +66,13 @@ class Connection: self.write(bytearray(value, 'utf8')) def read_ascii(self): - result = "" - while len(result) == 0 or result[-1] != "\x00": - result += self.read(1).decode("ascii") - return result[:-1] + result = bytearray() + while len(result) == 0 or result[-1] != 0: + result.extend(self.read(1)) + return result[:-1].decode("ISO-8859-1") def write_ascii(self, value): - self.write(bytearray(value, 'ascii')) + self.write(bytearray(value, 'ISO-8859-1')) self.write(bytearray.fromhex("00")) def read_short(self):