Skip to content

Commit df6df52

Browse files
pylint: fix invalid-name cases
Fix several cases of C0103 invalid-name. Part of #270
1 parent a23eaec commit df6df52

34 files changed

+275
-275
lines changed

setup.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,25 @@ def run(self):
4747
# Test runner
4848
# python setup.py test
4949
try:
50-
from test.setup_command import test
51-
cmdclass["test"] = test
50+
from test.setup_command import Test
51+
cmdclass["test"] = Test
5252
except ImportError:
5353
pass
5454

5555

5656
def read(*parts):
5757
filename = os.path.join(os.path.dirname(__file__), *parts)
58-
with codecs.open(filename, encoding='utf-8') as fp:
59-
return fp.read()
58+
with codecs.open(filename, encoding='utf-8') as file:
59+
return file.read()
6060

61-
def get_dependencies(file):
61+
def get_dependencies(filename):
6262
root = os.path.dirname(os.path.realpath(__file__))
63-
requirements = os.path.join(root, file)
63+
requirements = os.path.join(root, filename)
6464
result = []
6565
if os.path.isfile(requirements):
66-
with open(requirements) as f:
67-
return f.read().splitlines()
68-
raise RuntimeError("Unable to get dependencies from file " + file)
66+
with open(requirements) as file:
67+
return file.read().splitlines()
68+
raise RuntimeError("Unable to get dependencies from file " + filename)
6969

7070
def find_version(*file_paths):
7171
version_file = read(*file_paths)

tarantool/connection.py

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import socket
99
try:
1010
import ssl
11-
is_ssl_supported = True
11+
IS_SSL_SUPPORTED = True
1212
except ImportError:
13-
is_ssl_supported = False
13+
IS_SSL_SUPPORTED = False
1414
import sys
1515
import abc
1616

@@ -109,6 +109,9 @@
109109
)
110110
from typing import Union
111111

112+
WWSAEWOULDBLOCK = 10035
113+
ER_UNKNOWN_REQUEST_TYPE = 48
114+
112115
# Based on https://realpython.com/python-interface/
113116
class ConnectionInterface(metaclass=abc.ABCMeta):
114117
"""
@@ -862,9 +865,9 @@ def connect_tcp(self):
862865
(self.host, self.port), timeout=self.connection_timeout)
863866
self._socket.settimeout(self.socket_timeout)
864867
self._socket.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)
865-
except socket.error as e:
868+
except socket.error as exc:
866869
self.connected = False
867-
raise NetworkError(e)
870+
raise NetworkError(exc)
868871

869872
def connect_unix(self):
870873
"""
@@ -885,9 +888,9 @@ def connect_unix(self):
885888
self._socket.settimeout(self.connection_timeout)
886889
self._socket.connect(self.port)
887890
self._socket.settimeout(self.socket_timeout)
888-
except socket.error as e:
891+
except socket.error as exc:
889892
self.connected = False
890-
raise NetworkError(e)
893+
raise NetworkError(exc)
891894

892895
def wrap_socket_ssl(self):
893896
"""
@@ -898,7 +901,7 @@ def wrap_socket_ssl(self):
898901
:meta private:
899902
"""
900903

901-
if not is_ssl_supported:
904+
if not IS_SSL_SUPPORTED:
902905
raise SslError("Your version of Python doesn't support SSL")
903906

904907
ver = sys.version_info
@@ -939,10 +942,10 @@ def wrap_socket_ssl(self):
939942
context.set_ciphers(self.ssl_ciphers)
940943

941944
self._socket = context.wrap_socket(self._socket)
942-
except SslError as e:
943-
raise e
944-
except Exception as e:
945-
raise SslError(e)
945+
except SslError as exc:
946+
raise exc
947+
except Exception as exc:
948+
raise SslError(exc)
946949

947950
def _ssl_load_cert_chain(self, context):
948951
"""
@@ -967,8 +970,8 @@ def _ssl_load_cert_chain(self, context):
967970
keyfile=self.ssl_key_file,
968971
password=self.ssl_password)
969972
return
970-
except Exception as e:
971-
exc_list.append(e)
973+
except Exception as exc:
974+
exc_list.append(exc)
972975

973976

974977
if self.ssl_password_file is not None:
@@ -979,8 +982,8 @@ def _ssl_load_cert_chain(self, context):
979982
keyfile=self.ssl_key_file,
980983
password=line.rstrip())
981984
return
982-
except Exception as e:
983-
exc_list.append(e)
985+
except Exception as exc:
986+
exc_list.append(exc)
984987

985988

986989
try:
@@ -993,8 +996,8 @@ def password_raise_error():
993996
password=password_raise_error)
994997

995998
return
996-
except Exception as e:
997-
exc_list.append(e)
999+
except Exception as exc:
1000+
exc_list.append(exc)
9981001

9991002
raise SslError(exc_list)
10001003

@@ -1042,11 +1045,11 @@ def connect(self):
10421045
self.load_schema()
10431046
else:
10441047
self.schema = None
1045-
except SslError as e:
1046-
raise e
1047-
except Exception as e:
1048+
except SslError as exc:
1049+
raise exc
1050+
except Exception as exc:
10481051
self.connected = False
1049-
raise NetworkError(e)
1052+
raise NetworkError(exc)
10501053

10511054
def _recv(self, to_read):
10521055
"""
@@ -1135,9 +1138,9 @@ def _send_request_wo_reconnect(self, request, on_push=None, on_push_ctx=None):
11351138
self._socket.sendall(bytes(request))
11361139
response = request.response_class(self, self._read_response())
11371140
break
1138-
except SchemaReloadException as e:
1141+
except SchemaReloadException as exc:
11391142
if self.schema is not None:
1140-
self.update_schema(e.schema_version)
1143+
self.update_schema(exc.schema_version)
11411144
continue
11421145

11431146
while response._code == IPROTO_CHUNK:
@@ -1166,8 +1169,8 @@ def check(): # Check that connection is alive
11661169
buf = ctypes.create_string_buffer(2)
11671170
try:
11681171
sock_fd = self._socket.fileno()
1169-
except socket.error as e:
1170-
if e.errno == errno.EBADF:
1172+
except socket.error as exc:
1173+
if exc.errno == errno.EBADF:
11711174
return errno.ECONNRESET
11721175
else:
11731176
if os.name == 'nt':
@@ -1184,8 +1187,6 @@ def check(): # Check that connection is alive
11841187
err = ctypes.get_last_error()
11851188
self._socket.setblocking(True)
11861189

1187-
1188-
WWSAEWOULDBLOCK = 10035
11891190
if (retbytes < 0) and (err == errno.EAGAIN or
11901191
err == errno.EWOULDBLOCK or
11911192
err == WWSAEWOULDBLOCK):
@@ -1537,11 +1538,11 @@ class JoinState:
15371538

15381539
def _ops_process(self, space, update_ops):
15391540
new_ops = []
1540-
for op in update_ops:
1541-
if isinstance(op[1], str):
1542-
op = list(op)
1543-
op[1] = self.schema.get_field(space, op[1])['id']
1544-
new_ops.append(op)
1541+
for operation in update_ops:
1542+
if isinstance(operation[1], str):
1543+
operation = list(operation)
1544+
operation[1] = self.schema.get_field(space, operation[1])['id']
1545+
new_ops.append(operation)
15451546
return new_ops
15461547

15471548
def join(self, server_uuid):
@@ -1857,13 +1858,13 @@ def ping(self, notime=False):
18571858
"""
18581859

18591860
request = RequestPing(self)
1860-
t0 = time.time()
1861+
start_time = time.time()
18611862
self._send_request(request)
1862-
t1 = time.time()
1863+
finish_time = time.time()
18631864

18641865
if notime:
18651866
return "Success"
1866-
return t1 - t0
1867+
return finish_time - start_time
18671868

18681869
def select(self, space_name, key=None, *, offset=0, limit=0xffffffff, index=0, iterator=None, on_push=None, on_push_ctx=None):
18691870
"""
@@ -2140,7 +2141,6 @@ def _check_features(self):
21402141
server_features = response.features
21412142
server_auth_type = response.auth_type
21422143
except DatabaseError as exc:
2143-
ER_UNKNOWN_REQUEST_TYPE = 48
21442144
if exc.code == ER_UNKNOWN_REQUEST_TYPE:
21452145
server_protocol_version = None
21462146
server_features = []

0 commit comments

Comments
 (0)