merged tp32. fixed conflict related to better message deserializer implementation in 3.3.x line
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71587682 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71587682 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71587682 Branch: refs/heads/tp33 Commit: 71587682236138de179137a233d243100178ee4f Parents: 3f94a27 fa3fb9e Author: davebshow <davebs...@gmail.com> Authored: Mon May 14 12:15:37 2018 -0700 Committer: davebshow <davebs...@gmail.com> Committed: Mon May 14 12:15:37 2018 -0700 ---------------------------------------------------------------------- .../src/main/jython/gremlin_python/driver/connection.py | 7 +++++-- .../src/main/jython/gremlin_python/driver/protocol.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71587682/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py ---------------------------------------------------------------------- diff --cc gremlin-python/src/main/jython/gremlin_python/driver/protocol.py index 1330483,2fc7c1b..014daff --- a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py +++ b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py @@@ -85,13 -85,16 +86,15 @@@ class GremlinServerWSProtocol(AbstractB elif status_code == 204: result_set.stream.put_nowait([]) del results_dict[request_id] + return status_code elif status_code in [200, 206]: - results = [] - for msg in data["result"]["data"]: - results.append( - self._message_serializer.deserialize_message(msg)) - result_set.stream.put_nowait(results) - if status_code == 200: + result_set.stream.put_nowait(data) + if status_code == 206: + message = self._transport.read() + self.data_received(message, results_dict) + else: del results_dict[request_id] + return status_code else: del results_dict[request_id] raise GremlinServerError(