From 2f9eebc2110aa76648ae8bb11c757d6196d490a2 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 19 Mar 2019 07:38:16 -0700 Subject: [PATCH] Fix python3 encoding issues for remote commands Change-Id: Idb377eae4a2b52760cb810b590a75b5aea522968 --- gertty/app.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gertty/app.py b/gertty/app.py index 2c14e66..a6060cc 100644 --- a/gertty/app.py +++ b/gertty/app.py @@ -374,12 +374,12 @@ class App(object): try: s, addr = self.socket.accept() self.log.debug("Accepted socket connection %s" % (s,)) - buf = '' + buf = b'' while True: buf += s.recv(1) - if buf[-1] == '\n': + if buf[-1] == 10: break - buf = buf.strip() + buf = buf.decode('utf8').strip() self.log.debug("Received %s from socket" % (buf,)) s.close() parts = buf.split() @@ -874,7 +874,7 @@ class OpenChangeAction(argparse.Action): s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) s.connect(cf.socket_path) - s.sendall('open %s\n' % url) + s.sendall(('open %s\n' % url).encode('utf8')) sys.exit(0) def main():