Improve fidelity to pylint's standard rules.

bfxapi/websocket/_client/bfx_websocket_client.py

@@ -3,9 +3,9 @@ from typing import \
     Optional, Any
 
 from logging import Logger
+
 from datetime import datetime
 from socket import gaierror
-
 from asyncio import Task
 
 import \
@@ -68,6 +68,7 @@ class _Delay:
     def reset(self) -> None:
         self.__backoff_delay = _Delay.__BACKOFF_MIN
 
+#pylint: disable-next=too-many-instance-attributes
 class BfxWebSocketClient(Connection):
     def __init__(self,
                  host: str,
@@ -101,6 +102,7 @@ class BfxWebSocketClient(Connection):
             stack_trace = traceback.format_exception( \
                 type(exception), exception, exception.__traceback__)
 
+            #pylint: disable-next=logging-not-lazy
             self.__logger.critical(header + "\n" + \
                 str().join(stack_trace)[:-1])
 
@@ -158,12 +160,11 @@ class BfxWebSocketClient(Connection):
 
                 if isinstance(error, ConnectionClosedError) and error.code in (1006, 1012):
                     if error.code == 1006:
-                        self.__logger.error("Connection lost: no close frame " \
-                            "received or sent (1006). Trying to reconnect...")
+                        self.__logger.error("Connection lost: trying to reconnect...")
 
                     if error.code == 1012:
-                        self.__logger.info("WSS server is about to restart, clients need " \
-                            "to reconnect (server sent 20051). Reconnection attempt in progress...")
+                        self.__logger.warning("WSS server is restarting: all " \
+                            "clients need to reconnect (server sent 20051).")
 
                     if self.__timeout:
                         asyncio.get_event_loop().call_later(
@@ -177,10 +178,14 @@ class BfxWebSocketClient(Connection):
                     _delay.reset()
                 elif ((isinstance(error, InvalidStatusCode) and error.status_code == 408) or \
                         isinstance(error, gaierror)) and self.__reconnection:
-                    self.__logger.warning(
-                        f"_Reconnection attempt was unsuccessful (no.{self.__reconnection['attempts']}). " \
-                            f"Next reconnection attempt in {int(_delay.peek())}.0 seconds. (at the moment " \
-                                f"the client has been offline for {datetime.now() - self.__reconnection['timestamp']})")
+                    #pylint: disable-next=logging-fstring-interpolation
+                    self.__logger.warning("Reconnection attempt unsuccessful (no." \
+                        f"{self.__reconnection['attempts']}): next attempt in " \
+                            f"~{int(_delay.peek())}.0s.")
+
+                    #pylint: disable-next=logging-fstring-interpolation
+                    self.__logger.info(f"The client has been offline for " \
+                        f"{datetime.now() - self.__reconnection['timestamp']}.")
 
                     self.__reconnection["attempts"] += 1
                 else:
@@ -196,9 +201,10 @@ class BfxWebSocketClient(Connection):
     async def __connect(self) -> None:
         async with websockets.client.connect(self._host) as websocket:
             if self.__reconnection:
-                self.__logger.info(f"_Reconnection attempt successful (no.{self.__reconnection['attempts']}): The " \
-                    f"client has been offline for a total of {datetime.now() - self.__reconnection['timestamp']} " \
-                        f"(connection lost on: {self.__reconnection['timestamp']:%d-%m-%Y at %H:%M:%S}).")
+                #pylint: disable-next=logging-fstring-interpolation
+                self.__logger.warning("Reconnection attempt successful (no." \
+                    f"{self.__reconnection['attempts']}): recovering " \
+                        "connection state...")
 
                 self.__reconnection = None
 

bfxapi/websocket/_handlers/auth_events_handler.py

@@ -37,7 +37,7 @@ class AuthEventsHandler:
 
     def handle(self, abbrevation: str, stream: Any) -> None:
         if abbrevation == "n":
-            return self.__notification(stream)
+            self.__notification(stream)
 
         for abbrevations, serializer in AuthEventsHandler.__SERIALIZERS.items():
             if abbrevation in abbrevations:
@@ -45,12 +45,11 @@ class AuthEventsHandler:
 
                 if all(isinstance(sub_stream, list) for sub_stream in stream):
                     data = [ serializer.parse(*sub_stream) for sub_stream in stream ]
-                else: data = serializer.parse(*stream)
+                else:
+                    data = serializer.parse(*stream)
 
                 self.__event_emitter.emit(event, data)
 
-                break
-
     def __notification(self, stream: Any) -> None:
         event: str = "notification"
 

bfxapi/websocket/_handlers/public_channels_handler.py

@@ -35,6 +35,7 @@ class PublicChannelsHandler:
         elif subscription["channel"] == "status":
             self.__status_channel_handler(cast(Status, subscription), stream)
 
+    #pylint: disable-next=inconsistent-return-statements
     def __ticker_channel_handler(self, subscription: Ticker, stream: List[Any]):
         if subscription["symbol"].startswith("t"):
             return self.__event_emitter.emit("t_ticker_update", subscription, \
@@ -44,6 +45,7 @@ class PublicChannelsHandler:
             return self.__event_emitter.emit("f_ticker_update", subscription, \
                 serializers.FundingCurrencyTicker.parse(*stream[0]))
 
+    #pylint: disable-next=inconsistent-return-statements
     def __trades_channel_handler(self, subscription: Trades, stream: List[Any]):
         if (event := stream[0]) and event in [ "te", "tu", "fte", "ftu" ]:
             events = { "te": "t_trade_execution", "tu": "t_trade_execution_update", \
@@ -67,6 +69,7 @@ class PublicChannelsHandler:
                 [ serializers.FundingCurrencyTrade.parse(*sub_stream) \
                     for sub_stream in stream[0] ])
 
+    #pylint: disable-next=inconsistent-return-statements
     def __book_channel_handler(self, subscription: Book, stream: List[Any]):
         if subscription["symbol"].startswith("t"):
             if all(isinstance(sub_stream, list) for sub_stream in stream[0]):
@@ -86,6 +89,7 @@ class PublicChannelsHandler:
             return self.__event_emitter.emit("f_book_update", subscription, \
                 serializers.FundingCurrencyBook.parse(*stream[0]))
 
+    #pylint: disable-next=inconsistent-return-statements
     def __raw_book_channel_handler(self, subscription: Book, stream: List[Any]):
         if subscription["symbol"].startswith("t"):
             if all(isinstance(sub_stream, list) for sub_stream in stream[0]):
@@ -105,6 +109,7 @@ class PublicChannelsHandler:
             return self.__event_emitter.emit("f_raw_book_update", subscription, \
                 serializers.FundingCurrencyRawBook.parse(*stream[0]))
 
+    #pylint: disable-next=inconsistent-return-statements
     def __candles_channel_handler(self, subscription: Candles, stream: List[Any]):
         if all(isinstance(sub_stream, list) for sub_stream in stream[0]):
             return self.__event_emitter.emit("candles_snapshot", subscription, \
@@ -114,6 +119,7 @@ class PublicChannelsHandler:
         return self.__event_emitter.emit("candles_update", subscription, \
             serializers.Candle.parse(*stream[0]))
 
+    #pylint: disable-next=inconsistent-return-statements
     def __status_channel_handler(self, subscription: Status, stream: List[Any]):
         if subscription["key"].startswith("deriv:"):
             return self.__event_emitter.emit("derivatives_status_update", subscription, \
@@ -123,6 +129,7 @@ class PublicChannelsHandler:
             return self.__event_emitter.emit("liquidation_feed_update", subscription, \
                serializers.Liquidation.parse(*stream[0][0]))
 
+    #pylint: disable-next=inconsistent-return-statements
     def __checksum_handler(self, subscription: Book, value: int):
         return self.__event_emitter.emit( \
             "checksum", subscription, value & 0xFFFFFFFF)