aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2014-09-21 19:57:13 -0400
committerJesse Luehrs <doy@tozt.net>2014-09-21 20:10:37 -0400
commit58585d3002c3a8fc9d5cd81a3d56531f5484527c (patch)
treea4d2cd5045050e4706d90356bb55edc549f92a53
parent360be7f3f90bd757e3cb55448f4b85292dc6d77d (diff)
downloadpython-termcast-client-58585d3002c3a8fc9d5cd81a3d56531f5484527c.tar.gz
python-termcast-client-58585d3002c3a8fc9d5cd81a3d56531f5484527c.zip
never going to want this to not be encoded
-rw-r--r--termcast_client.py12
1 files 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()