Minor style fixes and ignoring of particular lints

Author: oschwald

examples/benchmark.py

@@ -23,7 +23,7 @@ def __init__(
         self,
         database_buffer: Union[FileBuffer, "mmap.mmap", bytes],
         pointer_base: int = 0,
-        pointer_test: bool = False,
+        pointer_test: bool = False,  # noqa: FBT001, FBT002
     ) -> None:
         """Create a Decoder for a MaxMind DB.
 

maxminddb/decoder.py

@@ -1,5 +1,3 @@
-
-
 # pylint: disable=E0601,E0602
 from ipaddress import IPv4Address, IPv6Address
 from os import PathLike
@@ -10,39 +8,25 @@ from typing_extensions import Self
 from maxminddb.types import Record
 
 class Reader:
-
-
     closed: bool = ...
 
     def __init__(
         self,
         database: AnyStr | int | PathLike | IO,
         mode: int = ...,
-    ) -> None:
-        ...
-
-    def close(self) -> None:
-        ...
-
-    def get(self, ip_address: str | IPv6Address | IPv4Address) -> Record | None:
-        ...
-
+    ) -> None: ...
+    def close(self) -> None: ...
+    def get(self, ip_address: str | IPv6Address | IPv4Address) -> Record | None: ...
     def get_with_prefix_len(
         self,
         ip_address: str | IPv6Address | IPv4Address,
-    ) -> tuple[Record | None, int]:
-        ...
-
-    def metadata(self) -> Metadata:
-        ...
-
+    ) -> tuple[Record | None, int]: ...
+    def metadata(self) -> Metadata: ...
     def __enter__(self) -> Self: ...
-    def __exit__(self, *args) -> None: ...
+    def __exit__(self, *args) -> None: ...  # noqa: ANN002
 
 # pylint: disable=too-few-public-methods
 class Metadata:
-
-
     binary_format_major_version: int
     """
     The major version number of the binary format used when creating the
@@ -92,5 +76,4 @@ class Metadata:
     The bit size of a record in the search tree.
     """
 
-    def __init__(self, **kwargs: Any) -> None:
-        ...
+    def __init__(self, **kwargs: Any) -> None: ...  # noqa: ANN401

maxminddb/extension.pyi

@@ -18,7 +18,7 @@ class FileBuffer:
     def __init__(self, database: str) -> None:
         """Create FileBuffer."""
         # pylint: disable=consider-using-with
-        self._handle = open(database, "rb")
+        self._handle = open(database, "rb")  # noqa: SIM115
         self._size = os.fstat(self._handle.fileno()).st_size
         if not hasattr(os, "pread"):
             self._lock = Lock()

maxminddb/file.py

@@ -6,6 +6,7 @@
     # pylint: disable=invalid-name
     mmap = None  # type: ignore[assignment]
 
+import contextlib
 import ipaddress
 import struct
 from collections.abc import Iterator
@@ -270,14 +271,13 @@ def _resolve_data_pointer(self, pointer: int) -> Record:
         return data
 
     def close(self) -> None:
-        """Closes the MaxMind DB file and returns the resources to the system."""
-        try:
-            self._buffer.close()  # type: ignore
-        except AttributeError:
-            pass
+        """Close the MaxMind DB file and returns the resources to the system."""
+        with contextlib.suppress(AttributeError):
+            self._buffer.close()  # type: ignore[union-attr]
+
         self.closed = True
 
-    def __exit__(self, *args) -> None:
+    def __exit__(self, *_) -> None:  # noqa: ANN002
         self.close()
 
     def __enter__(self) -> "Reader":

maxminddb/reader.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import ipaddress
 import multiprocessing
 import os
@@ -180,14 +178,15 @@ def test_get_with_prefix_len(self) -> None:
                 self.mode,
             ) as reader:
                 (record, prefix_len) = reader.get_with_prefix_len(
-                    cast("str", test["ip"])
+                    cast("str", test["ip"]),
                 )
 
                 self.assertEqual(
                     prefix_len,
                     test["expected_prefix_len"],
-                    f"expected prefix_len of {test['expected_prefix_len']} for {test['ip']}"
-                    + f" in {test['file_name']} but got {prefix_len}",
+                    f"expected prefix_len of {test['expected_prefix_len']}"
+                    f" for {test['ip']}"
+                    f" in {test['file_name']} but got {prefix_len}",
                 )
                 self.assertEqual(
                     record,
@@ -241,7 +240,10 @@ def test_iterator(self) -> None:
 
         for record_size in [24, 28, 32]:
             for test in tests:
-                f = f"tests/data/test-data/MaxMind-DB-test-{test['database']}-{record_size}.mmdb"
+                f = (
+                    f"tests/data/test-data/MaxMind-DB-test-{test['database']}"
+                    f"-{record_size}.mmdb"
+                )
                 reader = open_database(f, self.mode)
                 networks = [str(n) for (n, _) in reader]
                 self.assertEqual(networks, test["expected"], f)
@@ -326,7 +328,7 @@ def test_no_extension_exception(self) -> None:
                 "tests/data/test-data/MaxMind-DB-test-decoder.mmdb",
                 MODE_MMAP_EXT,
             )
-        maxminddb._extension = real_extension
+        maxminddb._extension = real_extension  # noqa: SLF001
 
     def test_broken_database(self) -> None:
         reader = open_database(
@@ -455,10 +457,8 @@ def test_double_close(self) -> None:
             self.mode,
         )
         reader.close()
-        self.assertIsNone(
-            reader.close(),
-            "Double close does not throw an exception",  # type:  ignore
-        )
+        # Check that calling close again doesn't raise an exception
+        reader.close()
 
     def test_closed_get(self) -> None:
         if self.mode in [MODE_MEMORY, MODE_FD]:
@@ -503,10 +503,6 @@ def test_closed(self) -> None:
         reader.close()
         self.assertEqual(reader.closed, True)
 
-    # XXX - Figure out whether we want to have the same behavior on both the
-    #       extension and the pure Python reader. If we do, the pure Python
-    #       reader will need to throw an exception or the extension will need
-    #       to keep the metadata in memory.
     def test_closed_metadata(self) -> None:
         reader = open_database(
             "tests/data/test-data/MaxMind-DB-test-decoder.mmdb",
@@ -535,26 +531,26 @@ def test_multiprocessing(self):
         def test_threading(self):
             self._check_concurrency(threading.Thread)
 
-        def _check_concurrency(self, worker_class) -> None:
+        def _check_concurrency(self, worker_class) -> None:  # noqa: ANN001
             reader = open_database(
                 "tests/data/test-data/GeoIP2-Domain-Test.mmdb",
                 self.mode,
             )
 
-            def lookup(pipe) -> None:
+            def lookup(pipe) -> None:  # noqa: ANN001
                 try:
                     for i in range(32):
                         reader.get(self.ipf(f"65.115.240.{i}"))
                     pipe.send(1)
-                except:
+                except:  # noqa: E722
                     pipe.send(0)
                 finally:
                     if worker_class is self.mp.Process:  # type: ignore[attr-defined]
                         reader.close()
                     pipe.close()
 
             pipes = [self.mp.Pipe() for _ in range(32)]
-            procs = [worker_class(target=lookup, args=(c,)) for (p, c) in pipes]
+            procs = [worker_class(target=lookup, args=(c,)) for (_, c) in pipes]
             for proc in procs:
                 proc.start()
             for proc in procs: