From d868d6df1111ecbff9b9d1ac2781e3aa8ed5c5f3 Mon Sep 17 00:00:00 2001 From: Jose Carrillo Date: Mon, 17 Oct 2016 19:49:09 -0500 Subject: [PATCH 1/2] Fix encoding --- webkit_server.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/webkit_server.py b/webkit_server.py index 4591f18..38ca909 100644 --- a/webkit_server.py +++ b/webkit_server.py @@ -513,9 +513,12 @@ def issue_command(self, cmd, *args): self._writeline(cmd) self._writeline(str(len(args))) for arg in args: - arg = str(arg) + if type(arg) != str and type(arg) != unicode: + arg = str(arg) + if type(arg) == unicode: + arg = arg.encode("utf-8") self._writeline(str(len(arg))) - self._sock.sendall(arg.encode("utf-8")) + self._sock.sendall(arg) return self._read_response() @@ -538,4 +541,4 @@ def _read_message(self): def _writeline(self, line): """ Writes a line to the underlying socket. """ - self._sock.sendall(line.encode("utf-8") + b"\n") + self._sock.sendall(line + b"\n") From cbc5a26a0f051576fd8cabd7a218d8a951346057 Mon Sep 17 00:00:00 2001 From: Jose Carrillo Date: Wed, 7 Dec 2016 21:32:58 -0500 Subject: [PATCH 2/2] Make ServerConnection._writeline accept unicode strings too --- webkit_server.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webkit_server.py b/webkit_server.py index 38ca909..b551e9e 100644 --- a/webkit_server.py +++ b/webkit_server.py @@ -540,5 +540,7 @@ def _read_message(self): return self.buf.read(size).decode("utf-8") def _writeline(self, line): + if type(line) == unicode: + line = line.encode("utf-8") """ Writes a line to the underlying socket. """ self._sock.sendall(line + b"\n")