Ignore and fix misc lints

Author: oschwald

examples/benchmark.py

@@ -9,6 +9,7 @@
 import timeit
 
 import geoip2.database
+import geoip2.errors
 
 parser = argparse.ArgumentParser(description="Benchmark maxminddb.")
 parser.add_argument("--count", default=250000, type=int, help="number of lookups")
@@ -33,4 +34,4 @@ def lookup_ip_address() -> None:
     number=args.count,
 )
 
-print(args.count / elapsed, "lookups per second")
+print(args.count / elapsed, "lookups per second")  # noqa: T201

geoip2/_internal.py

@@ -4,7 +4,7 @@
 from abc import ABCMeta
 
 
-class Model(metaclass=ABCMeta):
+class Model(metaclass=ABCMeta):  # noqa: B024
     """Shared methods for MaxMind model classes."""
 
     def __eq__(self, other: object) -> bool:
@@ -14,7 +14,7 @@ def __ne__(self, other: object) -> bool:
         return not self.__eq__(other)
 
     # pylint: disable=too-many-branches
-    def to_dict(self) -> dict:
+    def to_dict(self) -> dict:  # noqa: C901, PLR0912
         """Return a dict of the object suitable for serialization."""
         result = {}
         for key, value in self.__dict__.items():

geoip2/database.py

@@ -13,10 +13,9 @@
     MODE_MEMORY,
     MODE_MMAP,
     MODE_MMAP_EXT,
+    InvalidDatabaseError,
 )
 
-from maxminddb import InvalidDatabaseError
-
 import geoip2
 import geoip2.errors
 import geoip2.models

geoip2/records.py

@@ -176,7 +176,7 @@ def __init__(
         iso_code: str | None = None,
         names: dict[str, str] | None = None,
         # pylint:disable=redefined-builtin
-        type: str | None = None,
+        type: str | None = None,  # noqa: A002
         **_,
     ) -> None:
         self.type = type

geoip2/webservice.py

@@ -149,9 +149,11 @@ def _exception_for_4xx_status(
             decoded_body = json.loads(body)
         except ValueError as ex:
             return HTTPError(
-                f"Received a {status} error for {uri} but it did not include "
-                + "the expected JSON body: "
-                + ", ".join(ex.args),
+                (
+                    f"Received a {status} error for {uri} but it did not include "
+                    "the expected JSON body: "
+                    ", ".join(ex.args)
+                ),
                 status,
                 uri,
                 body,
@@ -284,7 +286,7 @@ class AsyncClient(BaseClient):
     _existing_session: aiohttp.ClientSession
     _proxy: str | None
 
-    def __init__(  # pylint: disable=too-many-arguments,too-many-positional-arguments
+    def __init__(  # pylint: disable=too-many-arguments,too-many-positional-arguments  # noqa: PLR0913
         self,
         account_id: int,
         license_key: str,
@@ -454,7 +456,7 @@ class Client(BaseClient):
     _session: requests.Session
     _proxies: dict[str, str] | None
 
-    def __init__(  # pylint: disable=too-many-arguments,too-many-positional-arguments
+    def __init__(  # pylint: disable=too-many-arguments,too-many-positional-arguments  # noqa: PLR0913
         self,
         account_id: int,
         license_key: str,

tests/database_test.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-
-
 import datetime
 import ipaddress
 import sys
@@ -47,7 +44,7 @@ def test_unknown_address_network(self) -> None:
             self.fail("Expected AddressNotFoundError")
         except geoip2.errors.AddressNotFoundError as e:
             self.assertEqual(e.network, ipaddress.ip_network("10.0.0.0/8"))
-        except Exception as e:
+        except Exception as e:  # noqa: BLE001
             self.fail(f"Expected AddressNotFoundError, got {type(e)}: {e!s}")
         finally:
             reader.close()
@@ -130,7 +127,11 @@ def test_asn(self) -> None:
         ip_address = "1.128.0.0"
         record = reader.asn(ip_address)
 
-        self.assertEqual(record, eval(repr(record)), "ASN repr can be eval'd")
+        self.assertEqual(
+            record,
+            eval(repr(record)),  # noqa: S307
+            "ASN repr can be eval'd",
+        )
 
         self.assertEqual(record.autonomous_system_number, 1221)
         self.assertEqual(record.autonomous_system_organization, "Telstra Pty Ltd")
@@ -178,7 +179,7 @@ def test_connection_type(self) -> None:
 
         self.assertEqual(
             record,
-            eval(repr(record)),
+            eval(repr(record)),  # noqa: S307
             "ConnectionType repr can be eval'd",
         )
 
@@ -218,7 +219,11 @@ def test_domain(self) -> None:
         ip_address = "1.2.0.0"
         record = reader.domain(ip_address)
 
-        self.assertEqual(record, eval(repr(record)), "Domain repr can be eval'd")
+        self.assertEqual(
+            record,
+            eval(repr(record)),  # noqa: S307
+            "Domain repr can be eval'd",
+        )
 
         self.assertEqual(record.domain, "maxmind.com")
         self.assertEqual(record.ip_address, ipaddress.ip_address(ip_address))
@@ -266,7 +271,11 @@ def test_isp(self) -> None:
         ) as reader:
             ip_address = "1.128.0.0"
             record = reader.isp(ip_address)
-            self.assertEqual(record, eval(repr(record)), "ISP repr can be eval'd")
+            self.assertEqual(
+                record,
+                eval(repr(record)),  # noqa: S307
+                "ISP repr can be eval'd",
+            )
 
             self.assertEqual(record.autonomous_system_number, 1221)
             self.assertEqual(record.autonomous_system_organization, "Telstra Pty Ltd")

tests/models_test.py

@@ -194,7 +194,11 @@ def test_insights_full(self) -> None:
             "Insights str representation looks reasonable",
         )
 
-        self.assertEqual(model, eval(repr(model)), "Insights repr can be eval'd")
+        self.assertEqual(
+            model,
+            eval(repr(model)),  # noqa: S307
+            "Insights repr can be eval'd",
+        )
 
         self.assertRegex(
             str(model.location),
@@ -204,23 +208,29 @@ def test_insights_full(self) -> None:
 
         self.assertEqual(
             model.location,
-            eval(repr(model.location)),
+            eval(repr(model.location)),  # noqa: S307
             "Location repr can be eval'd",
         )
 
-        self.assertIs(model.country.is_in_european_union, False)
-        self.assertIs(model.registered_country.is_in_european_union, False)
-        self.assertIs(model.represented_country.is_in_european_union, True)
+        self.assertIs(model.country.is_in_european_union, False)  # noqa: FBT003
+        self.assertIs(
+            model.registered_country.is_in_european_union,
+            False,  # noqa: FBT003
+        )
+        self.assertIs(
+            model.represented_country.is_in_european_union,
+            True,  # noqa: FBT003
+        )
 
-        self.assertIs(model.traits.is_anonymous, True)
-        self.assertIs(model.traits.is_anonymous_proxy, True)
-        self.assertIs(model.traits.is_anonymous_vpn, True)
-        self.assertIs(model.traits.is_anycast, True)
-        self.assertIs(model.traits.is_hosting_provider, True)
-        self.assertIs(model.traits.is_public_proxy, True)
-        self.assertIs(model.traits.is_residential_proxy, True)
-        self.assertIs(model.traits.is_satellite_provider, True)
-        self.assertIs(model.traits.is_tor_exit_node, True)
+        self.assertIs(model.traits.is_anonymous, True)  # noqa: FBT003
+        self.assertIs(model.traits.is_anonymous_proxy, True)  # noqa: FBT003
+        self.assertIs(model.traits.is_anonymous_vpn, True)  # noqa: FBT003
+        self.assertIs(model.traits.is_anycast, True)  # noqa: FBT003
+        self.assertIs(model.traits.is_hosting_provider, True)  # noqa: FBT003
+        self.assertIs(model.traits.is_public_proxy, True)  # noqa: FBT003
+        self.assertIs(model.traits.is_residential_proxy, True)  # noqa: FBT003
+        self.assertIs(model.traits.is_satellite_provider, True)  # noqa: FBT003
+        self.assertIs(model.traits.is_tor_exit_node, True)  # noqa: FBT003
         self.assertEqual(model.traits.user_count, 2)
         self.assertEqual(model.traits.static_ip_score, 1.3)
 
@@ -433,9 +443,9 @@ def test_unknown_keys(self) -> None:
             unk_base={"blah": 1},
         )
         with self.assertRaises(AttributeError):
-            model.unk_base  # type: ignore
+            model.unk_base  # type: ignore[attr-defined]  # noqa: B018
         with self.assertRaises(AttributeError):
-            model.traits.invalid  # type: ignore
+            model.traits.invalid  # type: ignore[attr-defined]  # noqa: B018
         self.assertEqual(
             model.traits.ip_address,
             ipaddress.ip_address("1.2.3.4"),

tests/webservice_test.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 from __future__ import annotations
 
 import asyncio
@@ -99,7 +97,7 @@ def test_country_ok(self) -> None:
         self.assertEqual(country.country.geoname_id, 1, "country geoname_id is 1")
         self.assertIs(
             country.country.is_in_european_union,
-            False,
+            False,  # noqa: FBT003
             "country is_in_european_union is False",
         )
         self.assertEqual(country.country.iso_code, "US", "country iso_code is US")
@@ -120,7 +118,7 @@ def test_country_ok(self) -> None:
         )
         self.assertIs(
             country.registered_country.is_in_european_union,
-            True,
+            True,  # noqa: FBT003
             "registered_country is_in_european_union is True",
         )
         self.assertEqual(
@@ -386,11 +384,11 @@ def test_insights_ok(self) -> None:
         self.assertEqual(insights.traits.user_count, 2, "user_count is 2")
 
     def test_named_constructor_args(self) -> None:
-        id = 47
+        account_id = 47
         key = "1234567890ab"
-        client = self.client_class(id, key)
-        self.assertEqual(client._account_id, str(id))
-        self.assertEqual(client._license_key, key)
+        client = self.client_class(account_id, key)
+        self.assertEqual(client._account_id, str(account_id))  # noqa: SLF001
+        self.assertEqual(client._license_key, key)  # noqa: SLF001
 
     def test_missing_constructor_args(self) -> None:
         with self.assertRaises(TypeError):
@@ -406,7 +404,7 @@ class TestClient(TestBaseClient):
     def setUp(self) -> None:
         self.client_class = Client
         self.client = Client(42, "abcdef123456")
-        self.client._base_uri = self.httpserver.url_for("/geoip/v2.1")
+        self.client._base_uri = self.httpserver.url_for("/geoip/v2.1")  # noqa: SLF001
         self.maxDiff = 20_000
 
     def run_client(self, v):  # noqa: ANN001
@@ -420,7 +418,7 @@ def setUp(self) -> None:
         self._loop = asyncio.new_event_loop()
         self.client_class = AsyncClient
         self.client = AsyncClient(42, "abcdef123456")
-        self.client._base_uri = self.httpserver.url_for("/geoip/v2.1")
+        self.client._base_uri = self.httpserver.url_for("/geoip/v2.1")  # noqa: SLF001
         self.maxDiff = 20_000
 
     def tearDown(self) -> None: