Merge branch 'cclauss-master-patch-16964' into 'master'

.gitlab-ci.yml: Lint with `ruff`, a radical superset of `flake8` written in Rust for speed.

See merge request cipres/aioipfs!5

Author: cipres

.gitlab-ci.yml

@@ -39,7 +39,7 @@ variables:
     - pip install wheel build
     - pip install '.[car,dev,bohort]'
 
-    - flake8 aioipfs tests --count --select=E9,F63,F7,F82 --show-source --statistics
+    - ruff check
     - mypy aioipfs
     - pytest --cov --cov-report=term --cov-report=xml:coverage.xml -v -s tests
 

aioipfs/__init__.py

@@ -18,7 +18,7 @@
 from multiaddr.exceptions import StringParseError  # type: ignore
 
 from aioipfs import api
-from aioipfs.exceptions import *  # noqa
+from aioipfs.exceptions import InvalidNodeAddressError
 from aioipfs.apis import dag as dag_api
 from aioipfs.apis import pin as pin_api
 from aioipfs.apis import multibase as multibase_api

aioipfs/api.py

@@ -14,7 +14,7 @@
 from .apis import HTTP_ERROR_CODES
 from .apis import SubAPI
 from . import multi
-from .helpers import *  # noqa
+from .helpers import ARG_PARAM, boolarg, quote_args, quote_dict
 
 
 class BitswapAPI(SubAPI):

aioipfs/apis/__init__.py

@@ -9,10 +9,13 @@
                                     HTTPNotFound,
                                     HTTPMethodNotAllowed,
                                     HTTPBadRequest)
-from aiohttp.client_exceptions import *  # noqa
+from aiohttp.client_exceptions import (ClientConnectorError, ClientPayloadError,
+                                       ServerDisconnectedError)
 
-from aioipfs.helpers import *  # noqa
-from aioipfs.exceptions import *  # noqa
+from aioipfs.helpers import decode_json
+from aioipfs.exceptions import (APIError, EndpointNotFoundError, IPFSConnectionError,
+                                InvalidCIDError, IpnsKeyError, NoSuchLinkError, NotPinnedError,
+                                PinRemoteError, RPCAccessDenied, UnknownAPIError)
 from aioipfs.util import car_decoder, have_car_decoder
 
 

aioipfs/apis/pin.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from aioipfs.apis import SubAPI
-from aioipfs.helpers import *  # noqa
+from aioipfs.helpers import ARG_PARAM, boolarg, quote_args, quote_dict
 
 
 class PinRemoteServiceAPI(SubAPI):

aioipfs/util.py

@@ -67,7 +67,7 @@ def _traverse(self, obj, attr):
         if self._is_indexable(obj):
             try:
                 return obj[int(attrd)]
-            except:
+            except Exception:
                 return None
         elif isinstance(obj, dict):
             return obj.get(attrd, None)

pyproject.toml

@@ -51,8 +51,8 @@ dev = [
     "pytest",
     "pytest-asyncio",
     "pytest-cov",
+    "ruff",
     "tox",
-    "flake8",
     "wheel",
 ]
 docs = [