Work around Python/C JSON unicode differences

The OVS C-based JSON parser operates on bytes, so the parser_feed function returns the number of bytes that are processed. The pure Python JSON parser currently operates on unicode, so it expects that Parser.feed() returns a number of characters. This difference leads to parsing errors when unicode characters are passed to the C JSON parser from Python. Signed-off-by: Terry Wilson <[email protected]> Signed-off-by: Ben Pfaff <[email protected]> Acked-by: Lucas Alvares Gomes <[email protected]>
qinghon · Oct 11, 2018 · 4617d1f · 4617d1f
1 parent a7be68a
commit 4617d1f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
@@ -272,7 +272,8 @@ def recv(self):
                 # data, so we convert it here as soon as possible.
                 if data and not error:
                     try:
-                        data = decoder.decode(data)
+                        if six.PY3 or ovs.json.PARSER == ovs.json.PARSER_PY:
+                            data = decoder.decode(data)
                     except UnicodeError:
                         error = errno.EILSEQ
                 if error:
@@ -298,7 +299,11 @@ def recv(self):
             else:
                 if self.parser is None:
                     self.parser = ovs.json.Parser()
-                self.input = self.input[self.parser.feed(self.input):]
+                if six.PY3 and ovs.json.PARSER == ovs.json.PARSER_C:
+                    self.input = self.input.encode('utf-8')[
+                        self.parser.feed(self.input):].decode()
+                else:
+                    self.input = self.input[self.parser.feed(self.input):]
                 if self.parser.is_done():
                     msg = self.__process_msg()
                     if msg: