Merge branch 'tp32' into tp33

Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd25300c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd25300c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd25300c

Branch: refs/heads/tp33
Commit: fd25300cd844b2e202083a4142768f64bf44afd2
Parents: e1c46b2 425bcd0
Author: Stephen Mallette <[email protected]>
Authored: Tue Sep 4 13:33:45 2018 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Tue Sep 4 13:33:45 2018 -0400

----------------------------------------------------------------------
 .../src/main/jython/tests/driver/test_client.py | 44 ++++++++++++++++++++
 1 file changed, 44 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd25300c/gremlin-python/src/main/jython/tests/driver/test_client.py
----------------------------------------------------------------------
diff --cc gremlin-python/src/main/jython/tests/driver/test_client.py
index 145bf9c,82b0221..0459428
--- a/gremlin-python/src/main/jython/tests/driver/test_client.py
+++ b/gremlin-python/src/main/jython/tests/driver/test_client.py
@@@ -20,8 -20,8 +20,9 @@@ import pytes
  
  from gremlin_python.driver.client import Client
  from gremlin_python.driver.request import RequestMessage
+ from gremlin_python.process.graph_traversal import __
  from gremlin_python.structure.graph import Graph
 +from gremlin_python.driver import serializer
  
  __author__ = 'David M. Brown ([email protected])'
  

Reply via email to