Minor auto-fixes from ruff

Author: oschwald

maxminddb/__init__.py

@@ -1,4 +1,5 @@
 """Module for reading MaxMind DB files."""
+
 # pylint:disable=C0111
 import os
 from typing import IO, AnyStr, Union, cast

maxminddb/decoder.py

@@ -1,7 +1,7 @@
 """Decoder for the MaxMind DB data section."""
 
 import struct
-from typing import Dict, List, Tuple, Union, cast
+from typing import Union, cast
 
 try:
     # pylint: disable=unused-import
@@ -37,35 +37,35 @@ def __init__(
         self._buffer = database_buffer
         self._pointer_base = pointer_base
 
-    def _decode_array(self, size: int, offset: int) -> Tuple[List[Record], int]:
+    def _decode_array(self, size: int, offset: int) -> tuple[list[Record], int]:
         array = []
         for _ in range(size):
             (value, offset) = self.decode(offset)
             array.append(value)
         return array, offset
 
-    def _decode_boolean(self, size: int, offset: int) -> Tuple[bool, int]:
+    def _decode_boolean(self, size: int, offset: int) -> tuple[bool, int]:
         return size != 0, offset
 
-    def _decode_bytes(self, size: int, offset: int) -> Tuple[bytes, int]:
+    def _decode_bytes(self, size: int, offset: int) -> tuple[bytes, int]:
         new_offset = offset + size
         return self._buffer[offset:new_offset], new_offset
 
-    def _decode_double(self, size: int, offset: int) -> Tuple[float, int]:
+    def _decode_double(self, size: int, offset: int) -> tuple[float, int]:
         self._verify_size(size, 8)
         new_offset = offset + size
         packed_bytes = self._buffer[offset:new_offset]
         (value,) = struct.unpack(b"!d", packed_bytes)
         return value, new_offset
 
-    def _decode_float(self, size: int, offset: int) -> Tuple[float, int]:
+    def _decode_float(self, size: int, offset: int) -> tuple[float, int]:
         self._verify_size(size, 4)
         new_offset = offset + size
         packed_bytes = self._buffer[offset:new_offset]
         (value,) = struct.unpack(b"!f", packed_bytes)
         return value, new_offset
 
-    def _decode_int32(self, size: int, offset: int) -> Tuple[int, int]:
+    def _decode_int32(self, size: int, offset: int) -> tuple[int, int]:
         if size == 0:
             return 0, offset
         new_offset = offset + size
@@ -76,15 +76,15 @@ def _decode_int32(self, size: int, offset: int) -> Tuple[int, int]:
         (value,) = struct.unpack(b"!i", packed_bytes)
         return value, new_offset
 
-    def _decode_map(self, size: int, offset: int) -> Tuple[Dict[str, Record], int]:
-        container: Dict[str, Record] = {}
+    def _decode_map(self, size: int, offset: int) -> tuple[dict[str, Record], int]:
+        container: dict[str, Record] = {}
         for _ in range(size):
             (key, offset) = self.decode(offset)
             (value, offset) = self.decode(offset)
-            container[cast(str, key)] = value
+            container[cast("str", key)] = value
         return container, offset
 
-    def _decode_pointer(self, size: int, offset: int) -> Tuple[Record, int]:
+    def _decode_pointer(self, size: int, offset: int) -> tuple[Record, int]:
         pointer_size = (size >> 3) + 1
 
         buf = self._buffer[offset : offset + pointer_size]
@@ -107,12 +107,12 @@ def _decode_pointer(self, size: int, offset: int) -> Tuple[Record, int]:
         (value, _) = self.decode(pointer)
         return value, new_offset
 
-    def _decode_uint(self, size: int, offset: int) -> Tuple[int, int]:
+    def _decode_uint(self, size: int, offset: int) -> tuple[int, int]:
         new_offset = offset + size
         uint_bytes = self._buffer[offset:new_offset]
         return int.from_bytes(uint_bytes, "big"), new_offset
 
-    def _decode_utf8_string(self, size: int, offset: int) -> Tuple[str, int]:
+    def _decode_utf8_string(self, size: int, offset: int) -> tuple[str, int]:
         new_offset = offset + size
         return self._buffer[offset:new_offset].decode("utf-8"), new_offset
 
@@ -132,7 +132,7 @@ def _decode_utf8_string(self, size: int, offset: int) -> Tuple[str, int]:
         15: _decode_float,
     }
 
-    def decode(self, offset: int) -> Tuple[Record, int]:
+    def decode(self, offset: int) -> tuple[Record, int]:
         """Decode a section of the data section starting at offset.
 
         Arguments:
@@ -156,7 +156,7 @@ def decode(self, offset: int) -> Tuple[Record, int]:
         (size, new_offset) = self._size_from_ctrl_byte(ctrl_byte, new_offset, type_num)
         return decoder(self, size, new_offset)
 
-    def _read_extended(self, offset: int) -> Tuple[int, int]:
+    def _read_extended(self, offset: int) -> tuple[int, int]:
         next_byte = self._buffer[offset]
         type_num = next_byte + 7
         if type_num < 7:
@@ -179,7 +179,7 @@ def _size_from_ctrl_byte(
         ctrl_byte: int,
         offset: int,
         type_num: int,
-    ) -> Tuple[int, int]:
+    ) -> tuple[int, int]:
         size = ctrl_byte & 0x1F
         if type_num == 1 or size < 29:
             return size, offset

maxminddb/extension.pyi

@@ -3,7 +3,7 @@
 # pylint: disable=E0601,E0602
 from ipaddress import IPv4Address, IPv6Address
 from os import PathLike
-from typing import IO, Any, AnyStr, Optional, Tuple, Union
+from typing import IO, Any, AnyStr, Optional, Union
 
 from maxminddb import MODE_AUTO
 from maxminddb.types import Record
@@ -44,7 +44,7 @@ class Reader:
     def get_with_prefix_len(
         self,
         ip_address: Union[str, IPv6Address, IPv4Address],
-    ) -> Tuple[Optional[Record], int]:
+    ) -> tuple[Optional[Record], int]:
         """Return a tuple with the record and the associated prefix length
 
         Arguments:

maxminddb/reader.py

@@ -8,9 +8,10 @@
 
 import ipaddress
 import struct
+from collections.abc import Iterator
 from ipaddress import IPv4Address, IPv6Address
 from os import PathLike
-from typing import IO, Any, AnyStr, Dict, Iterator, List, Optional, Tuple, Union
+from typing import IO, Any, AnyStr, Optional, Union
 
 from maxminddb.const import MODE_AUTO, MODE_FD, MODE_FILE, MODE_MEMORY, MODE_MMAP
 from maxminddb.decoder import Decoder
@@ -22,8 +23,7 @@
 
 
 class Reader:
-    """
-    A pure Python implementation of a reader for the MaxMind DB format. IP
+    """A pure Python implementation of a reader for the MaxMind DB format. IP
     addresses can be looked up using the ``get`` method.
     """
 
@@ -142,7 +142,7 @@ def get(self, ip_address: Union[str, IPv6Address, IPv4Address]) -> Optional[Reco
     def get_with_prefix_len(
         self,
         ip_address: Union[str, IPv6Address, IPv4Address],
-    ) -> Tuple[Optional[Record], int]:
+    ) -> tuple[Optional[Record], int]:
         """Return a tuple with the record and the associated prefix length.
 
         Arguments:
@@ -196,7 +196,7 @@ def _generate_children(self, node, depth, ip_acc) -> Iterator:
             right = self._read_node(node, 1)
             yield from self._generate_children(right, depth, ip_acc | 1)
 
-    def _find_address_in_tree(self, packed: bytearray) -> Tuple[int, int]:
+    def _find_address_in_tree(self, packed: bytearray) -> tuple[int, int]:
         bit_count = len(packed) * 8
         node = self._start_node(bit_count)
         node_count = self._metadata.node_count
@@ -297,7 +297,7 @@ class Metadata:
     A string identifying the database type, e.g., "GeoIP2-City".
     """
 
-    description: Dict[str, str]
+    description: dict[str, str]
     """
     A map from locales to text descriptions of the database.
     """
@@ -309,7 +309,7 @@ class Metadata:
     both IPv4 and IPv6 lookups.
     """
 
-    languages: List[str]
+    languages: list[str]
     """
     A list of locale codes supported by the databse.
     """

maxminddb/types.py

@@ -1,14 +1,14 @@
 """Types representing database records."""
 
-from typing import AnyStr, Dict, List, Union
+from typing import AnyStr, Union
 
 Primitive = Union[AnyStr, bool, float, int]
 Record = Union[Primitive, "RecordList", "RecordDict"]
 
 
-class RecordList(List[Record]):  # pylint: disable=too-few-public-methods
+class RecordList(list[Record]):  # pylint: disable=too-few-public-methods
     """RecordList is a type for lists in a database record."""
 
 
-class RecordDict(Dict[str, Record]):  # pylint: disable=too-few-public-methods
+class RecordDict(dict[str, Record]):  # pylint: disable=too-few-public-methods
     """RecordDict is a type for dicts in a database record."""

tests/reader_test.py

@@ -6,7 +6,7 @@
 import pathlib
 import threading
 import unittest
-from typing import Type, Union, cast
+from typing import Union, cast
 from unittest import mock
 
 import maxminddb
@@ -43,8 +43,8 @@ def get_reader_from_file_descriptor(filepath, mode) -> Reader:
 class BaseTestReader(unittest.TestCase):
     mode: int
     reader_class: Union[
-        Type["maxminddb.extension.Reader"],
-        Type["maxminddb.reader.Reader"],
+        type["maxminddb.extension.Reader"],
+        type["maxminddb.reader.Reader"],
     ]
     use_ip_objects = False
 
@@ -482,10 +482,13 @@ def test_with_statement_close(self) -> None:
         reader = open_database(filename, self.mode)
         reader.close()
 
-        with self.assertRaisesRegex(
-            ValueError,
-            "Attempt to reopen a closed MaxMind DB",
-        ), reader:
+        with (
+            self.assertRaisesRegex(
+                ValueError,
+                "Attempt to reopen a closed MaxMind DB",
+            ),
+            reader,
+        ):
             pass
 
     def test_closed(self) -> None:
@@ -642,7 +645,8 @@ def _check_ip_v6(self, reader, file_name) -> None:
 
 def has_maxminddb_extension() -> bool:
     return maxminddb.extension and hasattr(
-        maxminddb.extension, "Reader"
+        maxminddb.extension,
+        "Reader",
     )  # type:  ignore
 
 
@@ -673,8 +677,8 @@ class TestAutoReader(BaseTestReader):
     mode = MODE_AUTO
 
     reader_class: Union[
-        Type["maxminddb.extension.Reader"],
-        Type["maxminddb.reader.Reader"],
+        type["maxminddb.extension.Reader"],
+        type["maxminddb.reader.Reader"],
     ]
     if has_maxminddb_extension():
         reader_class = maxminddb.extension.Reader