ruff linting, part of #57

Author: meeb

Makefile

@@ -8,3 +8,11 @@ build:
 
 tld-endpoints:
 	uv run tools/list_public_tlds_with_rdap_endpoints.py
+
+
+check:
+	uvx ruff check
+
+
+format:
+	uvx ruff format

setup.py

@@ -1,5 +1,3 @@
-import os
-import sys
 from setuptools import setup, find_packages
 
 

tests/test_bootstrap.py

@@ -2,7 +2,6 @@
 import json
 from pathlib import Path
 from ipaddress import IPv4Network, IPv4Address, IPv6Network, IPv6Address
-
 import whoisit
 
 
@@ -87,7 +86,7 @@ def test_bootstrap_ipv6_parser(self):
         }
         self.assertEqual(whoisit._bootstrap.parse_ipv6_data(test_data), expected)
 
-    def test_bootstrap_ipv6_parser(self):
+    def test_bootstrap_object_parser(self):
         test_rdap_url = 'https://rdap.example.com/'
         test_data = [[['does', 'nothing', 'yet'], [test_rdap_url]]]
         expected = {}

tests/test_parser.py

@@ -3,9 +3,7 @@
 from pathlib import Path
 from datetime import datetime
 from ipaddress import IPv4Network, IPv6Network
-
 from dateutil.tz import tzoffset, tzutc
-
 import whoisit
 
 

tests/test_proxy.py

@@ -1,6 +1,4 @@
 import unittest
-
-
 import whoisit
 
 

tests/test_public_interface.py

@@ -3,15 +3,14 @@
 from datetime import datetime, timezone
 from ipaddress import IPv4Network, IPv6Network
 from pathlib import Path
-
 import pytest
 import responses
 import yaml
 from dateutil.tz import tzoffset
-from responses import _recorder
-
+# from responses import _recorder
 import whoisit
 
+
 BASE_DIR = Path(__file__).resolve().parent
 RESPONSES = BASE_DIR / "responses"
 UTC = timezone.utc

tests/test_query.py

@@ -2,7 +2,6 @@
 import unittest
 from pathlib import Path
 from ipaddress import IPv4Network, IPv4Address, IPv6Network, IPv6Address
-
 import whoisit
 
 

tools/list_public_tlds_with_rdap_endpoints.py

@@ -14,11 +14,11 @@
 sys.path.append(str(parent_dir))
 
 
-import requests
-import whoisit
-from whoisit.logger import get_logger
-from whoisit.errors import UnsupportedError
-from whoisit.overrides import iana_overrides
+import requests # noqa: E402
+import whoisit # noqa: E402
+from whoisit.logger import get_logger # noqa: E402
+from whoisit.errors import UnsupportedError # noqa: E402
+from whoisit.overrides import iana_overrides # noqa: E402
 
 
 log = get_logger('tools')
@@ -61,4 +61,4 @@ def get_endpoint(tld: str) -> tuple[list[str], str]:
             log.error(f'.{tld} UNSUPPORTED')
         else:
             log.info(f'.{tld} ({label}) endpoints {endpoints_str}')
-    log.info(f'Done')
+    log.info('Done')

whoisit/__init__.py

@@ -6,8 +6,8 @@
 from .errors import ArgumentError
 from .parser import parse
 from .query import Query, QueryAsync, QueryBuilder
-from .utils import get_async_client, get_session, recursive_merge, clear_session, set_proxy, get_proxy, clear_proxy
-from .version import version
+from .utils import get_async_client, get_session, recursive_merge, clear_session as clear_session, set_proxy as set_proxy, get_proxy as get_proxy, clear_proxy as clear_proxy
+from .version import version as version
 
 
 # Private methods

whoisit/bootstrap.py

@@ -164,12 +164,10 @@ def load_bootstrap_data(self, data: str | dict, overrides: bool = False, allow_i
             if from_json:
                 data = json.loads(data)
         except Exception as e:
-            raise BootstrapError(f'Unable to load bootstrap data, failed to parse '
-                                 f'as JSON: {e}') from e
+            raise BootstrapError(f'Unable to load bootstrap data, failed to parse as JSON: {e}') from e
         timestamp = data.get('timestamp', None)
         if not isinstance(timestamp, int):
-            raise BootstrapError(f'Unable to load bootstrap data, missing or '
-                                 f'invalid timestamp')
+            raise BootstrapError('Unable to load bootstrap data, missing or invalid timestamp')
         items_loaded = set()
         for name, item in data.items():
             if name == 'timestamp':