gremlinpython 3.5.6rc1__tar.gz → 3.5.8__tar.gz

gremlinpython-3.5.8/NOTICE

@@ -0,0 +1,5 @@
+Apache TinkerPop
+Copyright 2015-2023 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

{gremlinpython-3.5.6rc1/gremlinpython.egg-info → gremlinpython-3.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gremlinpython
-Version: 3.5.6rc1
+Version: 3.5.8
 Summary: Gremlin-Python for Apache TinkerPop
 Home-page: http://tinkerpop.apache.org
 License: Apache 2

{gremlinpython-3.5.6rc1 → gremlinpython-3.5.8}/gremlin_python/__version__.py

@@ -16,5 +16,5 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 '''
-version   = '3.5.6-rc1'
-timestamp = 1676568852
+version   = '3.5.8'
+timestamp = 1701712643

{gremlinpython-3.5.6rc1 → gremlinpython-3.5.8}/gremlin_python/driver/client.py

@@ -134,7 +134,11 @@ class Client:
             processor='session', op='close',
             args={'session': str(self._session)})
         conn = self._pool.get(True)
-        return conn.write(message).result()
+        try:
+            write_result_set = conn.write(message).result()
+            return write_result_set.all().result()  # wait for _receive() to finish
+        except protocol.GremlinServerError:
+            pass
 
     def _get_connection(self):
         protocol = self._protocol_factory()
@@ -154,6 +158,9 @@ class Client:
         return self.submit_async(message, bindings, request_options)
 
     def submit_async(self, message, bindings=None, request_options=None):
+        if self.is_closed():
+            raise Exception("Client is closed")
+
         logging.debug("message '%s'", str(message))
         args = {'gremlin': message, 'aliases': {'g': self._traversal_source}}
         processor = ''

{gremlinpython-3.5.6rc1 → gremlinpython-3.5.8}/gremlin_python/driver/driver_remote_connection.py

@@ -155,6 +155,10 @@ class DriverRemoteConnection(RemoteConnection):
         self.__spawned_sessions.append(conn)
         return conn
 
+    def remove_session(self, session_based_connection):
+        session_based_connection.close()
+        self.__spawned_sessions.remove(session_based_connection)
+
     def commit(self):
         logging.info("Submitting commit graph operation.")
         return self._client.submit(Bytecode.GraphOp.commit())

{gremlinpython-3.5.6rc1 → gremlinpython-3.5.8}/gremlin_python/driver/useragent.py

@@ -18,20 +18,16 @@
 #
 import platform
 
+gremlin_version = "3.5.8"  # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
 
 def _generate_user_agent():
     application_name = "NotAvailable"
-    try:
-        from gremlin_python import __version__
-        driver_version = __version__.version.replace(" ", "_")
-    except ImportError:
-        driver_version = "NotAvailable"
     runtime_version = platform.python_version().replace(" ", "_")
     os_name = platform.system().replace(" ", "_")
     os_version = platform.release().replace(" ", "_")
     architecture = platform.machine().replace(" ", "_")
     user_agent = "{appName} Gremlin-Python.{driverVersion} {runtimeVersion} {osName}.{osVersion} {cpuArch}".format(
-                    appName=application_name, driverVersion=driver_version, runtimeVersion=runtime_version,
+                    appName=application_name, driverVersion=gremlin_version, runtimeVersion=runtime_version,
                     osName=os_name, osVersion=os_version, cpuArch=architecture)
 
     return user_agent

{gremlinpython-3.5.6rc1 → gremlinpython-3.5.8}/gremlin_python/process/graph_traversal.py

@@ -1090,8 +1090,8 @@ class Transaction:
             raise Exception(error_message)
 
     def __close_session(self, session):
-        self._session_based_connection.close()
         self.__is_open = False
+        self._remote_connection.remove_session(self._session_based_connection)
         return session
 
 

{gremlinpython-3.5.6rc1 → gremlinpython-3.5.8}/gremlin_python/process/translator.py

@@ -67,7 +67,7 @@ class Translator:
     # Do any needed special processing for the representation
     # of strings and dates.
     def fixup(self, v):
-        if type(v) == str:
+        if isinstance(v, str):
             return f'\'{v}\''
         elif type(v) == datetime:
             return self.process_date(v)
@@ -133,7 +133,7 @@ class Translator:
                   script += f'WithOptions.{self.options[p]}'
                 elif type(p) == Bytecode:
                     script += self.translate(p, True)
-                elif type(p) == P:
+                elif isinstance(p, P):
                     script += self.process_predicate(p)
                 elif type(p) in [Cardinality, Pop]:
                     tmp = str(p)
@@ -146,10 +146,12 @@ class Translator:
                 elif p == WithOptions.tokens:
                     script += 'WithOptions.tokens'
                     with_opts = True
-                elif type(p) == str:
+                elif isinstance(p, str):
                     script += f'\'{p}\''
                 elif type(p) == bool:
                     script += 'true' if p else 'false'
+                elif p is None:
+                    script += 'null'
                 else:
                     script += str(p)
                 c += 1

{gremlinpython-3.5.6rc1 → gremlinpython-3.5.8/gremlinpython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gremlinpython
-Version: 3.5.6rc1
+Version: 3.5.8
 Summary: Gremlin-Python for Apache TinkerPop
 Home-page: http://tinkerpop.apache.org
 License: Apache 2

gremlinpython-3.5.6rc1/NOTICE

@@ -1,5 +0,0 @@
-Apache TinkerPop
-Copyright 2015-2022 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).