update bindings logic and fix failing tests

gremlin-python/src/main/python/gremlin_python/driver/client.py

@@ -168,7 +168,12 @@ def submit_async(self, message, bindings=None, request_options=None):
         conn = self._pool.get(True)
         if request_options:
             message.fields.update({token: request_options[token] for token in TokensV4
-                                   if token in request_options})
+                                   if token in request_options and token != 'bindings'})
+            if 'bindings' in request_options:
+                if 'bindings' in message.fields:
+                    message.fields['bindings'].update(request_options['bindings'])
+                else:
+                    message.fields['bindings'] = request_options['bindings']
             if 'params' in request_options:
                 if 'bindings' in message.fields:
                     message.fields['bindings'].update(request_options['params'])

gremlin-python/src/main/python/tests/driver/test_client.py

@@ -264,6 +264,8 @@ def test_client_gremlin_lang_request_options_with_binding(client):
     request_opts['bindings'] = {'y': 4}
     result_set = client.submit('g.V(y).values("name")', request_options=request_opts)
     assert result_set.all().result()[0] == 'josh'
+    result_set = client.submit('g.V(z).values("name")', bindings={'z': 5}, request_options=request_opts)
+    assert result_set.all().result()[0] == 'ripple'
 
 
 def test_iterate_result_set(client):
@@ -366,8 +368,9 @@ def thread_run(tr, result_list):
 def test_client_gremlin_lang_with_short(client):
     g = GraphTraversalSource(Graph(), TraversalStrategies())
     t = g.with_('language', 'gremlin-lang').V().has('age', short(16)).count()
+    request_opts = DriverRemoteConnection.extract_request_options(t.gremlin_lang)
     message = create_basic_request_message(t)
-    result_set = client.submit(message)
+    result_set = client.submit(message, request_options=request_opts)
     results = []
     for result in result_set:
         results += result
@@ -377,8 +380,9 @@ def test_client_gremlin_lang_with_short(client):
 def test_client_gremlin_lang_with_long(client):
     g = GraphTraversalSource(Graph(), TraversalStrategies())
     t = g.V().has('age', long(851401972585122)).count()
+    request_opts = DriverRemoteConnection.extract_request_options(t.gremlin_lang)
     message = create_basic_request_message(t)
-    result_set = client.submit(message)
+    result_set = client.submit(message, request_options=request_opts)
     results = []
     for result in result_set:
         results += result
@@ -388,8 +392,9 @@ def test_client_gremlin_lang_with_long(client):
 def test_client_gremlin_lang_with_bigint(client):
     g = GraphTraversalSource(Graph(), TraversalStrategies())
     t = g.with_('language', 'gremlin-lang').V().has('age', bigint(0x1000_0000_0000_0000_0000)).count()
+    request_opts = DriverRemoteConnection.extract_request_options(t.gremlin_lang)
     message = create_basic_request_message(t)
-    result_set = client.submit(message)
+    result_set = client.submit(message, request_options=request_opts)
     results = []
     for result in result_set:
         results += result