From d2e825d82200e913e7909459a908bdab19c18b31 Mon Sep 17 00:00:00 2001
From: davebshow <davebshow@gmail.com>
Date: Sat, 23 May 2015 00:48:39 -0400
Subject: [PATCH] more params fixes
---
aiogremlin/client.py | 3 ++-
aiogremlin/pool.py | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/aiogremlin/client.py b/aiogremlin/client.py
index 965a8e2..5e30106 100644
--- a/aiogremlin/client.py
+++ b/aiogremlin/client.py
@@ -70,15 +70,16 @@ class GremlinClient:
self.timeout = timeout
self._pool = pool
self._connector = connector
- self._factory = factory or GremlinFactory(connector=self._connector)
self._conn = connection
if pool is not None:
+ factory = pool._factory
self._connected = self._pool._connected
elif self._conn and not getattr(connection, "closed", True):
self._connected = True
else:
self._connected = False
self._conn = asyncio.async(self._connect(), loop=self._loop)
+ self._factory = factory or GremlinFactory(connector=self._connector)
if verbose:
logger.setLevel(INFO)
diff --git a/aiogremlin/pool.py b/aiogremlin/pool.py
index c6e90b0..328e780 100644
--- a/aiogremlin/pool.py
+++ b/aiogremlin/pool.py
@@ -16,11 +16,11 @@ class WebSocketPool:
"""
"""
self.url = url
- self._ws_response_class = (ws_response_class or
- GremlinClientWebSocketResponse)
+ if ws_response_class is None:
+ ws_response_class = GremlinClientWebSocketResponse
self._factory = factory or GremlinFactory(
connector=connector,
- ws_response_class=self._ws_response_class)
+ ws_response_class=ws_response_class)
self.poolsize = poolsize
self.max_retries = max_retries
self.timeout = timeout
--
GitLab