gremlinpython 3.7.2__tar.gz → 3.7.3__tar.gz

{gremlinpython-3.7.2/gremlinpython.egg-info → gremlinpython-3.7.3}/PKG-INFO

@@ -1,14 +1,17 @@
 Metadata-Version: 2.1
 Name: gremlinpython
-Version: 3.7.2
+Version: 3.7.3
 Summary: Gremlin-Python for Apache TinkerPop
-Home-page: http://tinkerpop.apache.org
+Home-page: https://tinkerpop.apache.org
+Maintainer: Apache TinkerPop
+Maintainer-email: dev@tinkerpop.apache.org
 License: Apache 2
 Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 Provides-Extra: kerberos
 Provides-Extra: ujson

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/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.7.2'
-timestamp = 1713201447
+version   = '3.7.3'
+timestamp = 1730223986

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/gremlin_python/driver/aiohttp/transport.py

@@ -29,7 +29,8 @@ __author__ = 'Lyndon Bauto (lyndonb@bitquilltech.com)'
 class AiohttpTransport(AbstractBaseTransport):
     nest_asyncio_applied = False
 
-    def __init__(self, call_from_event_loop=None, read_timeout=None, write_timeout=None, **kwargs):
+    def __init__(self, call_from_event_loop=None, read_timeout=None, write_timeout=None, enable_compression=False,
+                 **kwargs):
         if call_from_event_loop is not None and call_from_event_loop and not AiohttpTransport.nest_asyncio_applied:
             """ 
                 The AiohttpTransport implementation uses the asyncio event loop. Because of this, it cannot be called 
@@ -50,10 +51,13 @@ class AiohttpTransport(AbstractBaseTransport):
         self._aiohttp_kwargs = kwargs
         self._write_timeout = write_timeout
         self._read_timeout = read_timeout
+        self._enable_compression = enable_compression
         if "max_content_length" in self._aiohttp_kwargs:
             self._aiohttp_kwargs["max_msg_size"] = self._aiohttp_kwargs.pop("max_content_length")
         if "ssl_options" in self._aiohttp_kwargs:
             self._aiohttp_kwargs["ssl"] = self._aiohttp_kwargs.pop("ssl_options")
+        if self._enable_compression and "compress" not in self._aiohttp_kwargs:
+            self._aiohttp_kwargs["compress"] = 15  # enable per-message deflate compression with 32k sliding window size
 
     def __del__(self):
         # Close will only actually close if things are left open, so this is safe to call.

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/gremlin_python/driver/client.py

@@ -44,7 +44,8 @@ class Client:
                  transport_factory=None, pool_size=None, max_workers=None,
                  message_serializer=None, username="", password="",
                  kerberized_service="", headers=None, session=None,
-                 enable_user_agent_on_connect=True, **transport_kwargs):
+                 enable_user_agent_on_connect=True, enable_compression=False,
+                 **transport_kwargs):
         log.info("Creating Client with url '%s'", url)
 
         # check via url that we are using http protocol
@@ -55,6 +56,7 @@ class Client:
         self._headers = headers
         self._enable_user_agent_on_connect = enable_user_agent_on_connect
         self._traversal_source = traversal_source
+        self._enable_compression = enable_compression
         if not self._use_http and "max_content_length" not in transport_kwargs:
             transport_kwargs["max_content_length"] = 10 * 1024 * 1024
         if message_serializer is None:
@@ -77,7 +79,7 @@ class Client:
                     if self._use_http:
                         return AiohttpHTTPTransport(**transport_kwargs)
                     else:
-                        return AiohttpTransport(**transport_kwargs)
+                        return AiohttpTransport(enable_compression=enable_compression, **transport_kwargs)
         self._transport_factory = transport_factory
         if protocol_factory is None:
             def protocol_factory():

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/gremlin_python/driver/connection.py

@@ -39,9 +39,7 @@ class Connection:
         self._inited = False
         self._enable_user_agent_on_connect = enable_user_agent_on_connect
         if self._enable_user_agent_on_connect:
-            if self._headers is None:
-                self._headers = dict()
-            self._headers[useragent.userAgentHeader] = useragent.userAgent
+            self.__add_header(useragent.userAgentHeader, useragent.userAgent)
 
     def connect(self):
         if self._transport:
@@ -94,3 +92,15 @@ class Connection:
                     break
         finally:
             self._pool.put_nowait(self)
+
+    def __add_header(self, key, value):
+        if self._headers is None:
+            self._headers = dict()
+        # Headers may be a list of pairs
+        if isinstance(self._headers, list):
+            for pair in self._headers:
+                if pair[0] == key:
+                    self._headers.remove(pair)
+            self._headers.append((key, value))
+        else:
+            self._headers[key] = value

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/gremlin_python/driver/driver_remote_connection.py

@@ -39,7 +39,7 @@ class DriverRemoteConnection(RemoteConnection):
                  username="", password="", kerberized_service='',
                  message_serializer=None, graphson_reader=None,
                  graphson_writer=None, headers=None, session=None,
-                 enable_user_agent_on_connect=True, **transport_kwargs):
+                 enable_user_agent_on_connect=True, enable_compression=False, **transport_kwargs):
         log.info("Creating DriverRemoteConnection with url '%s'", str(url))
         self.__url = url
         self.__traversal_source = traversal_source
@@ -56,6 +56,7 @@ class DriverRemoteConnection(RemoteConnection):
         self.__headers = headers
         self.__session = session
         self.__enable_user_agent_on_connect = enable_user_agent_on_connect
+        self.__enable_compression = enable_compression
         self.__transport_kwargs = transport_kwargs
 
         # keeps a list of sessions that have been spawned from this DriverRemoteConnection
@@ -78,6 +79,7 @@ class DriverRemoteConnection(RemoteConnection):
                                      headers=headers,
                                      session=session,
                                      enable_user_agent_on_connect=enable_user_agent_on_connect,
+                                     enable_compression=enable_compression,
                                      **transport_kwargs)
         self._url = self._client._url
         self._traversal_source = self._client._traversal_source

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/gremlin_python/driver/useragent.py

@@ -18,7 +18,7 @@
 #
 import platform
 
-gremlin_version = "3.7.2"  # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+gremlin_version = "3.7.3"  # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
 
 def _generate_user_agent():
     application_name = "NotAvailable"

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/gremlin_python/structure/io/graphbinaryV1.py

@@ -603,7 +603,9 @@ class EdgeIO(_GraphBinaryTypeIO):
         inv = Vertex(r.read_object(b), r.to_object(b, DataType.string, False))
         outv = Vertex(r.read_object(b), r.to_object(b, DataType.string, False))
         b.read(2)
-        properties = r.read_object(b)
+        props = r.read_object(b)
+        # null properties are returned as empty lists
+        properties = [] if props is None else props
         edge = Edge(edgeid, outv, edgelbl, inv, properties)
         return edge
 
@@ -682,7 +684,12 @@ class VertexIO(_GraphBinaryTypeIO):
 
     @classmethod
     def _read_vertex(cls, b, r):
-        vertex = Vertex(r.read_object(b), r.to_object(b, DataType.string, False), r.read_object(b))
+        vertex_id = r.read_object(b)
+        vertex_label = r.to_object(b, DataType.string, False)
+        props = r.read_object(b)
+        # null properties are returned as empty lists
+        properties = [] if props is None else props
+        vertex = Vertex(vertex_id, vertex_label, properties)
         return vertex
 
 
@@ -709,7 +716,9 @@ class VertexPropertyIO(_GraphBinaryTypeIO):
     def _read_vertexproperty(cls, b, r):
         vp = VertexProperty(r.read_object(b), r.to_object(b, DataType.string, False), r.read_object(b), None)
         b.read(2)
-        vp.properties = r.read_object(b)
+        properties = r.read_object(b)
+        # null properties are returned as empty lists
+        vp.properties = [] if properties is None else properties
         return vp
 
 

{gremlinpython-3.7.2 → gremlinpython-3.7.3/gremlinpython.egg-info}/PKG-INFO

@@ -1,14 +1,17 @@
 Metadata-Version: 2.1
 Name: gremlinpython
-Version: 3.7.2
+Version: 3.7.3
 Summary: Gremlin-Python for Apache TinkerPop
-Home-page: http://tinkerpop.apache.org
+Home-page: https://tinkerpop.apache.org
+Maintainer: Apache TinkerPop
+Maintainer-email: dev@tinkerpop.apache.org
 License: Apache 2
 Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 Provides-Extra: kerberos
 Provides-Extra: ujson

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/gremlinpython.egg-info/requires.txt

@@ -1,8 +1,8 @@
 nest_asyncio
 aiohttp<4.0.0,>=3.8.0
 aenum<4.0.0,>=1.4.5
-six<2.0.0,>=1.10.0
 isodate<1.0.0,>=0.6.0
+async-timeout<5.0.0,>=4.0.3
 
 [kerberos]
 kerberos<2.0.0,>=1.3.0

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [aliases]
 test = pytest
 

{gremlinpython-3.7.2 → gremlinpython-3.7.3}/setup.py

@@ -18,7 +18,6 @@ under the License.
 """
 import codecs
 import os
-import sys
 import time
 from setuptools import setup
 
@@ -48,13 +47,10 @@ install_requires = [
     'nest_asyncio',
     'aiohttp>=3.8.0,<4.0.0',
     'aenum>=1.4.5,<4.0.0',
-    'six>=1.10.0,<2.0.0',
-    'isodate>=0.6.0,<1.0.0'
+    'isodate>=0.6.0,<1.0.0',
+    'async-timeout>=4.0.3,<5.0.0'
 ]
 
-if sys.version_info < (3, 5):
-    install_requires += ['pyparsing>=2.4.7,<3.0.0']
-
 setup(
     name='gremlinpython',
     version=version,
@@ -62,8 +58,10 @@ setup(
               'gremlin_python.driver.aiohttp', 'gremlin_python.process',
               'gremlin_python.structure', 'gremlin_python.structure.io'],
     license='Apache 2',
-    url='http://tinkerpop.apache.org',
+    url='https://tinkerpop.apache.org',
     description='Gremlin-Python for Apache TinkerPop',
+    maintainer='Apache TinkerPop',
+    maintainer_email='dev@tinkerpop.apache.org',
     long_description=codecs.open("README.rst", "r", "UTF-8").read(),
     long_description_content_type='text/x-rst',
     test_suite="tests",
@@ -74,7 +72,6 @@ setup(
     ],
     tests_require=[
         'pytest>=4.6.4,<7.2.0',
-        'mock>=3.0.5,<5.0.0',
         'radish-bdd==0.13.4',
         'PyHamcrest>=1.9.0,<3.0.0',
         'PyYAML>=5.3'
@@ -89,5 +86,6 @@ setup(
         "License :: OSI Approved :: Apache Software License",
         "Natural Language :: English",
         "Programming Language :: Python :: 3"
-    ]
+    ],
+    python_requires='>=3.9'
 )