ci: add bugbear to linting and fix all violations

Author: owenpearson

ably/http/http.py

@@ -188,7 +188,7 @@ async def make_request(self, method, path, version=None, headers=None, body=None
 
         hosts = self.get_rest_hosts()
         for retry_count, host in enumerate(hosts):
-            def should_stop_retrying():
+            def should_stop_retrying(retry_count=retry_count):
                 time_passed = time.time() - requested_at
                 # if it's the last try or cumulative timeout is done, we stop retrying
                 return retry_count == len(hosts) - 1 or time_passed > http_max_retry_duration

ably/realtime/connectionmanager.py

@@ -125,7 +125,7 @@ async def ping(self) -> float:
             try:
                 response = await self.__ping_future
             except asyncio.CancelledError:
-                raise AblyException("Ping request cancelled due to request timeout", 504, 50003)
+                raise AblyException("Ping request cancelled due to request timeout", 504, 50003) from None
             return response
 
         self.__ping_future = asyncio.Future()
@@ -139,7 +139,7 @@ async def ping(self) -> float:
         try:
             await asyncio.wait_for(self.__ping_future, self.__timeout_in_secs)
         except asyncio.TimeoutError:
-            raise AblyException("Timeout waiting for ping response", 504, 50003)
+            raise AblyException("Timeout waiting for ping response", 504, 50003) from None
 
         ping_end_time = datetime.now().timestamp()
         response_time_ms = (ping_end_time - ping_start_time) * 1000

ably/rest/auth.py

@@ -186,7 +186,7 @@ async def request_token(self, token_params: dict | None = None,
             try:
                 token_request = await auth_callback(token_params)
             except Exception as e:
-                raise AblyException("auth_callback raised an exception", 401, 40170, cause=e)
+                raise AblyException("auth_callback raised an exception", 401, 40170, cause=e) from e
         elif auth_url:
             log.debug("using token auth with authUrl")
 
@@ -210,7 +210,7 @@ async def request_token(self, token_params: dict | None = None,
             except TypeError as e:
                 msg = "Expected token request callback to call back with a token string, token request object, or \
                 token details object"
-                raise AblyAuthException(msg, 401, 40170, cause=e)
+                raise AblyAuthException(msg, 401, 40170, cause=e) from e
         elif isinstance(token_request, str):
             if len(token_request) == 0:
                 raise AblyAuthException("Token string is empty", 401, 4017)

ably/rest/rest.py

@@ -61,9 +61,7 @@ def __init__(self, key: Optional[str] = None, token: Optional[str] = None,
         else:
             options = Options(**kwargs)
 
-        try:
-            self._is_realtime
-        except AttributeError:
+        if not hasattr(self, '_is_realtime'):
             self._is_realtime = False
 
         self.__http = Http(self, options)

ably/transport/websockettransport.py

@@ -96,7 +96,7 @@ async def ws_connect(self, ws_url, headers):
             exception = AblyException(f'Error opening websocket connection: {e}', 400, 40000)
             log.exception(f'WebSocketTransport.ws_connect(): Error opening websocket connection: {exception}')
             self._emit('failed', exception)
-            raise exception
+            raise exception from e
 
     async def _handle_websocket_connection(self, ws_url, websocket):
         log.info(f'ws_connect(): connection established to {ws_url}')

ably/types/authoptions.py

@@ -36,7 +36,7 @@ def set_key(self, key):
         except ValueError:
             raise AblyException("key of not len 2 parameters: {}"
                                 .format(key.split(':')),
-                                401, 40101)
+                                401, 40101) from None
 
     def replace(self, auth_options):
         if type(auth_options) is dict:

ably/types/mixins.py

@@ -101,7 +101,7 @@ def decode(data, encoding='', cipher=None, context=None):
 
                 except Exception as e:
                     log.error(f'VCDiff decode failed: {e}')
-                    raise AblyException('VCDiff decode failure', 40018, 40018)
+                    raise AblyException('VCDiff decode failure', 40018, 40018) from e
 
             elif encoding.startswith(f'{CipherData.ENCODING_ID}+'):
                 if not cipher:

ably/util/exceptions.py

@@ -43,7 +43,7 @@ def raise_for_response(response):
                       response.text)
             raise AblyException(message=response.text,
                                 status_code=response.status_code,
-                                code=response.status_code * 100)
+                                code=response.status_code * 100) from None
 
         if decoded_response and 'error' in decoded_response:
             error = decoded_response['error']
@@ -56,7 +56,7 @@ def raise_for_response(response):
             except KeyError:
                 msg = "Unexpected exception decoding server response: %s"
                 msg = msg % response.text
-                raise AblyException(message=msg, status_code=500, code=50000)
+                raise AblyException(message=msg, status_code=500, code=50000) from None
 
         raise AblyException(message="",
                             status_code=response.status_code,
@@ -91,7 +91,7 @@ async def wrapper(*args, **kwargs):
             return await func(*args, **kwargs)
         except Exception as e:
             log.exception(e)
-            raise AblyException.from_exception(e)
+            raise AblyException.from_exception(e) from e
 
     return wrapper
 

pyproject.toml

@@ -87,8 +87,8 @@ extend-exclude = [
 ]
 
 [tool.ruff.lint]
-# Enable Pyflakes (F), pycodestyle (E, W), pep8-naming (N), isort (I), and pyupgrade (UP)
-select = ["E", "W", "F", "N", "I", "UP"]
+# Enable Pyflakes (F), pycodestyle (E, W), pep8-naming (N), isort (I), pyupgrade (UP) and bugbear (B)
+select = ["E", "W", "F", "N", "I", "UP", "B"]
 ignore = [
   "N818",  # exception name should end in 'Error'
 ]

test/ably/rest/restchannelpublish_test.py

@@ -402,7 +402,7 @@ async def test_interoperability(self):
                 response = await channel.publish(data=expected_value)
                 assert response.status_code == 201
 
-                async def check_data():
+                async def check_data(encoding=encoding, msg_data=msg_data):
                     async with httpx.AsyncClient(http2=True) as client:
                         r = await client.get(url, auth=auth)
                         item = r.json()[0]
@@ -418,7 +418,7 @@ async def check_data():
                 response = await channel.publish(messages=[Message(data=msg_data, encoding=encoding)])
                 assert response.status_code == 201
 
-                async def check_history():
+                async def check_history(expected_value=expected_value, expected_type=expected_type):
                     history = await channel.history()
                     message = history.items[0]
                     return message.data == expected_value and isinstance(message.data, type_mapping[expected_type])