8
8
import socket
9
9
try :
10
10
import ssl
11
- is_ssl_supported = True
11
+ IS_SSL_SUPPORTED = True
12
12
except ImportError :
13
- is_ssl_supported = False
13
+ IS_SSL_SUPPORTED = False
14
14
import sys
15
15
import abc
16
16
109
109
)
110
110
from typing import Union
111
111
112
+ WWSAEWOULDBLOCK = 10035
113
+ ER_UNKNOWN_REQUEST_TYPE = 48
114
+
112
115
# Based on https://realpython.com/python-interface/
113
116
class ConnectionInterface (metaclass = abc .ABCMeta ):
114
117
"""
@@ -862,9 +865,9 @@ def connect_tcp(self):
862
865
(self .host , self .port ), timeout = self .connection_timeout )
863
866
self ._socket .settimeout (self .socket_timeout )
864
867
self ._socket .setsockopt (socket .SOL_TCP , socket .TCP_NODELAY , 1 )
865
- except socket .error as e :
868
+ except socket .error as exc :
866
869
self .connected = False
867
- raise NetworkError (e )
870
+ raise NetworkError (exc )
868
871
869
872
def connect_unix (self ):
870
873
"""
@@ -885,9 +888,9 @@ def connect_unix(self):
885
888
self ._socket .settimeout (self .connection_timeout )
886
889
self ._socket .connect (self .port )
887
890
self ._socket .settimeout (self .socket_timeout )
888
- except socket .error as e :
891
+ except socket .error as exc :
889
892
self .connected = False
890
- raise NetworkError (e )
893
+ raise NetworkError (exc )
891
894
892
895
def wrap_socket_ssl (self ):
893
896
"""
@@ -898,7 +901,7 @@ def wrap_socket_ssl(self):
898
901
:meta private:
899
902
"""
900
903
901
- if not is_ssl_supported :
904
+ if not IS_SSL_SUPPORTED :
902
905
raise SslError ("Your version of Python doesn't support SSL" )
903
906
904
907
ver = sys .version_info
@@ -939,10 +942,10 @@ def wrap_socket_ssl(self):
939
942
context .set_ciphers (self .ssl_ciphers )
940
943
941
944
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 )
946
949
947
950
def _ssl_load_cert_chain (self , context ):
948
951
"""
@@ -967,8 +970,8 @@ def _ssl_load_cert_chain(self, context):
967
970
keyfile = self .ssl_key_file ,
968
971
password = self .ssl_password )
969
972
return
970
- except Exception as e :
971
- exc_list .append (e )
973
+ except Exception as exc :
974
+ exc_list .append (exc )
972
975
973
976
974
977
if self .ssl_password_file is not None :
@@ -979,8 +982,8 @@ def _ssl_load_cert_chain(self, context):
979
982
keyfile = self .ssl_key_file ,
980
983
password = line .rstrip ())
981
984
return
982
- except Exception as e :
983
- exc_list .append (e )
985
+ except Exception as exc :
986
+ exc_list .append (exc )
984
987
985
988
986
989
try :
@@ -993,8 +996,8 @@ def password_raise_error():
993
996
password = password_raise_error )
994
997
995
998
return
996
- except Exception as e :
997
- exc_list .append (e )
999
+ except Exception as exc :
1000
+ exc_list .append (exc )
998
1001
999
1002
raise SslError (exc_list )
1000
1003
@@ -1042,11 +1045,11 @@ def connect(self):
1042
1045
self .load_schema ()
1043
1046
else :
1044
1047
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 :
1048
1051
self .connected = False
1049
- raise NetworkError (e )
1052
+ raise NetworkError (exc )
1050
1053
1051
1054
def _recv (self , to_read ):
1052
1055
"""
@@ -1135,9 +1138,9 @@ def _send_request_wo_reconnect(self, request, on_push=None, on_push_ctx=None):
1135
1138
self ._socket .sendall (bytes (request ))
1136
1139
response = request .response_class (self , self ._read_response ())
1137
1140
break
1138
- except SchemaReloadException as e :
1141
+ except SchemaReloadException as exc :
1139
1142
if self .schema is not None :
1140
- self .update_schema (e .schema_version )
1143
+ self .update_schema (exc .schema_version )
1141
1144
continue
1142
1145
1143
1146
while response ._code == IPROTO_CHUNK :
@@ -1166,8 +1169,8 @@ def check(): # Check that connection is alive
1166
1169
buf = ctypes .create_string_buffer (2 )
1167
1170
try :
1168
1171
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 :
1171
1174
return errno .ECONNRESET
1172
1175
else :
1173
1176
if os .name == 'nt' :
@@ -1184,8 +1187,6 @@ def check(): # Check that connection is alive
1184
1187
err = ctypes .get_last_error ()
1185
1188
self ._socket .setblocking (True )
1186
1189
1187
-
1188
- WWSAEWOULDBLOCK = 10035
1189
1190
if (retbytes < 0 ) and (err == errno .EAGAIN or
1190
1191
err == errno .EWOULDBLOCK or
1191
1192
err == WWSAEWOULDBLOCK ):
@@ -1537,11 +1538,11 @@ class JoinState:
1537
1538
1538
1539
def _ops_process (self , space , update_ops ):
1539
1540
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 )
1545
1546
return new_ops
1546
1547
1547
1548
def join (self , server_uuid ):
@@ -1857,13 +1858,13 @@ def ping(self, notime=False):
1857
1858
"""
1858
1859
1859
1860
request = RequestPing (self )
1860
- t0 = time .time ()
1861
+ start_time = time .time ()
1861
1862
self ._send_request (request )
1862
- t1 = time .time ()
1863
+ finish_time = time .time ()
1863
1864
1864
1865
if notime :
1865
1866
return "Success"
1866
- return t1 - t0
1867
+ return finish_time - start_time
1867
1868
1868
1869
def select (self , space_name , key = None , * , offset = 0 , limit = 0xffffffff , index = 0 , iterator = None , on_push = None , on_push_ctx = None ):
1869
1870
"""
@@ -2140,7 +2141,6 @@ def _check_features(self):
2140
2141
server_features = response .features
2141
2142
server_auth_type = response .auth_type
2142
2143
except DatabaseError as exc :
2143
- ER_UNKNOWN_REQUEST_TYPE = 48
2144
2144
if exc .code == ER_UNKNOWN_REQUEST_TYPE :
2145
2145
server_protocol_version = None
2146
2146
server_features = []
0 commit comments