Merge branch 'python-glv-graphson-update' of https://github.com/aholmberg/tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c5b08831 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c5b08831 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c5b08831 Branch: refs/heads/master Commit: c5b088310c617d037b9af6e95d6be064f07133af Parents: ce41db1 0e211d6 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Wed Oct 12 14:02:48 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Wed Oct 12 14:02:48 2016 -0600 ---------------------------------------------------------------------- .../driver/driver_remote_connection.py | 16 +- .../gremlin_python/structure/io/graphson.py | 518 ++++++++++--------- .../driver/test_driver_remote_connection.py | 4 +- .../jython/tests/structure/io/test_graphson.py | 104 +++- .../python/jsr223/JythonScriptEngineSetup.java | 5 +- .../jsr223/PythonGraphSONJavaTranslator.java | 2 +- .../io/graphson/GraphSONReaderTest.java | 68 +-- .../io/graphson/GraphSONWriterTest.java | 56 +- 8 files changed, 427 insertions(+), 346 deletions(-) ----------------------------------------------------------------------