Skip to content

Commit a6f8404

Browse files
DifferentialOrangeDifferentialOrange
committed
Rename internal _transport variable
"transport" is a keyword that is used to define SSL connection in Tarantool Enterprise 2.10 and newer. It would be convenient to use `self._transport` to store user input `transport` variable, but this name is already used to store connection transport. This patch renames the instance variable. Part of igorcoding#22
1 parent 8a8a227 commit a6f8404

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎asynctnt/connection.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Connection(Api):
3131
'_fetch_schema', '_auto_refetch_schema', '_initial_read_buffer_size',
3232
'_encoding', '_connect_timeout', '_reconnect_timeout',
3333
'_request_timeout', '_ping_timeout', '_loop', '_state', '_state_prev',
34-
'_transport', '_protocol',
34+
'_connection_transport', '_protocol',
3535
'_disconnect_waiter', '_reconnect_task',
3636
'_connect_lock', '_disconnect_lock',
3737
'_ping_task', '__create_task'
@@ -138,7 +138,7 @@ def __init__(self, *,
138138
self._loop = None
139139
self.__create_task = None
140140

141-
self._transport = None
141+
self._connection_transport = None
142142
self._protocol: Optional[protocol.Protocol] = None
143143

144144
self._state = ConnectionState.DISCONNECTED
@@ -157,9 +157,9 @@ def _set_state(self, new_state: ConnectionState):
157157
self._state = new_state
158158

159159
def connection_lost(self, exc):
160-
if self._transport:
161-
self._transport.close()
162-
self._transport = None
160+
if self._connection_transport:
161+
self._connection_transport.close()
162+
self._connection_transport = None
163163

164164
if self._disconnect_waiter:
165165
# disconnect() call happened
@@ -294,7 +294,7 @@ async def full_connect():
294294
logger.info('%s Connected successfully', self.fingerprint)
295295
self._set_state(ConnectionState.CONNECTED)
296296

297-
self._transport = tr
297+
self._connection_transport = tr
298298
self._protocol = pr
299299
self._set_db(self._protocol.get_common_db())
300300
self._reconnect_task = None
@@ -379,17 +379,17 @@ async def disconnect(self):
379379
self._ping_task = None
380380

381381
self._clear_db()
382-
if self._transport:
382+
if self._connection_transport:
383383
self._disconnect_waiter = _create_future(self._loop)
384-
self._transport.close()
385-
self._transport = None
384+
self._connection_transport.close()
385+
self._connection_transport = None
386386
self._protocol = None
387387

388388
await self._disconnect_waiter
389389
self._disconnect_waiter = None
390390
self._set_state(ConnectionState.DISCONNECTED)
391391
else:
392-
self._transport = None
392+
self._connection_transport = None
393393
self._protocol = None
394394
self._disconnect_waiter = None
395395
self._set_state(ConnectionState.DISCONNECTED)
@@ -414,10 +414,10 @@ def close(self):
414414
self._ping_task.cancel()
415415
self._ping_task = None
416416

417-
if self._transport:
418-
self._transport.close()
417+
if self._connection_transport:
418+
self._connection_transport.close()
419419

420-
self._transport = None
420+
self._connection_transport = None
421421
self._protocol = None
422422
self._disconnect_waiter = None
423423
self._clear_db()

‎asynctnt/instance.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ def __init__(self, tnt, on_exit):
3535
super().__init__()
3636
self._tnt = tnt
3737
self._on_exit = on_exit
38-
self._transport = None
38+
self._connection_transport = None
3939

4040
@property
4141
def logger(self):
4242
return self._tnt.logger
4343

4444
@property
4545
def pid(self):
46-
return self._transport.get_pid() if self._transport else None
46+
return self._connection_transport.get_pid() if self._connection_transport else None
4747

4848
def connection_made(self, transport):
4949
self.logger.info('Process started')
50-
self._transport = transport
50+
self._connection_transport = transport
5151

5252
def pipe_data_received(self, fd, data):
5353
if not data:
@@ -62,28 +62,28 @@ def pipe_data_received(self, fd, data):
6262
self.logger.info('=> %s', line)
6363

6464
def process_exited(self):
65-
return_code = self._transport.get_returncode()
65+
return_code = self._connection_transport.get_returncode()
6666
if callable(self._on_exit):
6767
self._on_exit(return_code)
6868

6969
@property
7070
def returncode(self):
71-
return self._transport.get_returncode()
71+
return self._connection_transport.get_returncode()
7272

7373
async def wait(self):
7474
"""Wait until the process exit and return the process return code.
7575
7676
This method is a coroutine."""
77-
return await self._transport._wait()
77+
return await self._connection_transport._wait()
7878

7979
def send_signal(self, signal):
80-
self._transport.send_signal(signal)
80+
self._connection_transport.send_signal(signal)
8181

8282
def terminate(self):
83-
self._transport.terminate()
83+
self._connection_transport.terminate()
8484

8585
def kill(self):
86-
self._transport.kill()
86+
self._connection_transport.kill()
8787

8888

8989
class TarantoolInstance(metaclass=abc.ABCMeta):
@@ -618,7 +618,7 @@ def __init__(self, **kwargs):
618618
self._loop = get_running_loop(kwargs.pop('loop', None))
619619

620620
self._is_stopping = False
621-
self._transport = None
621+
self._connection_transport = None
622622
self._protocol = None
623623
self._last_return_code = None
624624
self._stop_event = asyncio.Event()
@@ -674,7 +674,7 @@ async def start(self, *, wait=True, recreate=True):
674674
args = [initlua_path]
675675
else:
676676
args = self._command_args
677-
self._transport, self._protocol = await self._loop.subprocess_exec(
677+
self._connection_transport, self._protocol = await self._loop.subprocess_exec(
678678
factory,
679679
self._command_to_run, *args,
680680
stdin=None,
@@ -739,9 +739,9 @@ def cleanup(self):
739739
self._logger.info('Finished with return code %d', return_code)
740740

741741
self._is_stopping = False
742-
if self._transport:
743-
self._transport.close()
744-
self._transport = None
742+
if self._connection_transport:
743+
self._connection_transport.close()
744+
self._connection_transport = None
745745
self._protocol = None
746746
self._stop_event.clear()
747747

‎tests/test_connect.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ async def test__connect(self):
3838
c = await conn.connect()
3939
self.assertEqual(conn.loop, self.loop)
4040
self.assertEqual(c, conn)
41-
self.assertIsNotNone(conn._transport)
41+
self.assertIsNotNone(conn._connection_transport)
4242
self.assertIsNotNone(conn._protocol)
4343
self.assertTrue(conn.is_connected)
4444
self.assertTrue(conn.is_fully_connected)
@@ -64,7 +64,7 @@ async def test__connect_direct(self):
6464
self.assertEqual(conn.loop, self.loop)
6565
self.assertIsNone(conn.initial_read_buffer_size)
6666

67-
self.assertIsNotNone(conn._transport)
67+
self.assertIsNotNone(conn._connection_transport)
6868
self.assertIsNotNone(conn._protocol)
6969
self.assertTrue(conn.is_connected)
7070
self.assertTrue(conn.is_fully_connected)
@@ -100,7 +100,7 @@ async def test__connect_unix(self):
100100
self.assertEqual(conn.loop, self.loop)
101101
self.assertIsNone(conn.initial_read_buffer_size)
102102

103-
self.assertIsNotNone(conn._transport)
103+
self.assertIsNotNone(conn._connection_transport)
104104
self.assertIsNotNone(conn._protocol)
105105
self.assertTrue(conn.is_connected)
106106
self.assertTrue(conn.is_fully_connected)
@@ -119,7 +119,7 @@ async def test__connect_contextmanager(self):
119119
self.assertEqual(conn.state, ConnectionState.DISCONNECTED)
120120

121121
async with conn:
122-
self.assertIsNotNone(conn._transport)
122+
self.assertIsNotNone(conn._connection_transport)
123123
self.assertIsNotNone(conn._protocol)
124124
self.assertTrue(conn.is_connected)
125125
self.assertTrue(conn.is_fully_connected)
@@ -163,7 +163,7 @@ async def test__connect_no_schema(self):
163163
fetch_schema=False,
164164
auto_refetch_schema=False)
165165
async with conn:
166-
self.assertIsNotNone(conn._transport)
166+
self.assertIsNotNone(conn._connection_transport)
167167
self.assertIsNotNone(conn._protocol)
168168
self.assertTrue(conn.is_connected)
169169
self.assertTrue(conn.is_fully_connected)
@@ -176,7 +176,7 @@ async def test__connect_auth(self):
176176
username='t1', password='t1',
177177
reconnect_timeout=0)
178178
async with conn:
179-
self.assertIsNotNone(conn._transport)
179+
self.assertIsNotNone(conn._connection_transport)
180180
self.assertIsNotNone(conn._protocol)
181181
self.assertTrue(conn.is_connected)
182182
self.assertTrue(conn.is_fully_connected)
@@ -193,7 +193,7 @@ async def test__connect_auth_no_schema(self):
193193
self.assertEqual(conn.username, 't1')
194194
self.assertEqual(conn.password, 't1')
195195
async with conn:
196-
self.assertIsNotNone(conn._transport)
196+
self.assertIsNotNone(conn._connection_transport)
197197
self.assertIsNotNone(conn._protocol)
198198
self.assertTrue(conn.is_connected)
199199
self.assertTrue(conn.is_fully_connected)

0 commit comments

Comments
 (0)