From 7ef93a6bca7863837aeeece9747e093215aee393 Mon Sep 17 00:00:00 2001
From: davebshow <davebshow@gmail.com>
Date: Wed, 6 Jul 2016 09:48:54 -0400
Subject: [PATCH] removed abstract properties for connection interface, fixed
indentation
---
goblin/driver/api.py | 3 +--
goblin/driver/connection.py | 22 +++++-----------------
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/goblin/driver/api.py b/goblin/driver/api.py
index 8ca0c20..b3fecf9 100644
--- a/goblin/driver/api.py
+++ b/goblin/driver/api.py
@@ -19,10 +19,9 @@ class GremlinServer:
pool: pool.Pool=None,
username: str=None,
password: str=None) -> connection.Connection:
- # Use connection factory here
if conn_factory is None:
conn_factory = aiohttp.ClientSession(loop=loop)
- ws = await conn_factory.ws_connect(url)
+ ws = await conn_factory.ws_connect(url)
return connection.Connection(ws, loop, conn_factory,
max_inflight=max_inflight,
force_close=force_close,
diff --git a/goblin/driver/connection.py b/goblin/driver/connection.py
index ee19abd..2cbf049 100644
--- a/goblin/driver/connection.py
+++ b/goblin/driver/connection.py
@@ -58,18 +58,6 @@ class AbstractConnection(abc.ABC):
async def close(self):
raise NotImplementedError
- @abc.abstractproperty
- def closed(self):
- return self._closed
-
- @abc.abstractproperty
- def force_close(self):
- return self._force_close
-
- @abc.abstractproperty
- def force_release(self):
- return self._force_release
-
class Connection(AbstractConnection):
@@ -114,15 +102,15 @@ class Connection(AbstractConnection):
@property
def closed(self):
- return super().close
+ return self._closed
@property
def force_close(self):
- return super().force_close
+ return self._force_close
@property
def force_release(self):
- return super().force_release
+ return self._force_release
async def release(self):
if self.pool:
@@ -165,8 +153,8 @@ class Connection(AbstractConnection):
self._pool = None
await self._conn_factory.close()
- def _prepare_message(self, gremlin, bindings, lang, aliases, op, processor,
- session, request_id):
+ def _prepare_message(self, gremlin, bindings, lang, aliases, op,
+ processor, session, request_id):
message = {
"requestId": request_id,
"op": op,
--
GitLab