From 58585d3002c3a8fc9d5cd81a3d56531f5484527c Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 21 Sep 2014 19:57:13 -0400 Subject: never going to want this to not be encoded --- termcast_client.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/termcast_client.py b/termcast_client.py index 449ebb8..661f803 100644 --- a/termcast_client.py +++ b/termcast_client.py @@ -16,7 +16,7 @@ class Client(object): def run(self, argv): sock = socket.socket() sock.connect((self.host, self.port)) - sock.send(self._build_connection_string().encode('utf-8')) + sock.send(self._build_connection_string()) pty.spawn(argv, lambda fd: self._master_read(fd, sock)) def _master_read(self, fd, sock): @@ -25,7 +25,13 @@ class Client(object): return data def _build_connection_string(self): - auth = "hello %s %s\n" % (self.username, self.password) + auth = ( + b'hello ' + + self.username.encode('utf-8') + + b' ' + + self.password.encode('utf-8') + + b'\n' + ) size = shutil.get_terminal_size() metadata = self._build_metadata_string({ "geometry": [ size.columns, size.lines ], @@ -33,7 +39,7 @@ class Client(object): return auth + metadata def _build_metadata_string(self, data): - return '\033]499;%s\007' % json.dumps(data) + return b'\033]499;' + json.dumps(data).encode('utf-8') + b'\007' if __name__ == '__main__': parser = argparse.ArgumentParser() -- cgit v1.2.3