Run ruff's fixer

Author: oschwald

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # geoip2 documentation build configuration file, created by
 # sphinx-quickstart on Tue Apr  9 13:34:57 2013.
@@ -12,8 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

examples/benchmark.py

@@ -1,15 +1,14 @@
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
 
-from __future__ import print_function
 
 import argparse
-import geoip2.database
 import random
 import socket
 import struct
 import timeit
 
+import geoip2.database
+
 parser = argparse.ArgumentParser(description="Benchmark maxminddb.")
 parser.add_argument("--count", default=250000, type=int, help="number of lookups")
 parser.add_argument("--mode", default=0, type=int, help="reader mode to use")

geoip2/_internal.py

@@ -2,13 +2,12 @@
 
 # pylint: disable=too-few-public-methods
 from abc import ABCMeta
-from typing import Any
 
 
 class Model(metaclass=ABCMeta):
     """Shared methods for MaxMind model classes"""
 
-    def __eq__(self, other: Any) -> bool:
+    def __eq__(self, other: object) -> bool:
         return isinstance(other, self.__class__) and self.to_dict() == other.to_dict()
 
     def __ne__(self, other):

geoip2/database.py

@@ -7,41 +7,41 @@
 
 import inspect
 import os
-from typing import Any, AnyStr, cast, IO, Optional, Sequence, Type, Union
+from collections.abc import Sequence
+from typing import IO, Any, AnyStr, Optional, Type, Union, cast
 
 import maxminddb
-
 from maxminddb import (
     MODE_AUTO,
-    MODE_MMAP,
-    MODE_MMAP_EXT,
+    MODE_FD,
     MODE_FILE,
     MODE_MEMORY,
-    MODE_FD,
+    MODE_MMAP,
+    MODE_MMAP_EXT,
 )
 
 import geoip2
-import geoip2.models
 import geoip2.errors
-from geoip2.types import IPAddress
+import geoip2.models
 from geoip2.models import (
     ASN,
+    ISP,
     AnonymousIP,
     City,
     ConnectionType,
     Country,
     Domain,
     Enterprise,
-    ISP,
 )
+from geoip2.types import IPAddress
 
 __all__ = [
     "MODE_AUTO",
-    "MODE_MMAP",
-    "MODE_MMAP_EXT",
+    "MODE_FD",
     "MODE_FILE",
     "MODE_MEMORY",
-    "MODE_FD",
+    "MODE_MMAP",
+    "MODE_MMAP_EXT",
     "Reader",
 ]
 
@@ -135,9 +135,9 @@ def country(self, ip_address: IPAddress) -> Country:
         :returns: :py:class:`geoip2.models.Country` object
 
         """
-
         return cast(
-            Country, self._model_for(geoip2.models.Country, "Country", ip_address)
+            Country,
+            self._model_for(geoip2.models.Country, "Country", ip_address),
         )
 
     def city(self, ip_address: IPAddress) -> City:
@@ -161,7 +161,9 @@ def anonymous_ip(self, ip_address: IPAddress) -> AnonymousIP:
         return cast(
             AnonymousIP,
             self._flat_model_for(
-                geoip2.models.AnonymousIP, "GeoIP2-Anonymous-IP", ip_address
+                geoip2.models.AnonymousIP,
+                "GeoIP2-Anonymous-IP",
+                ip_address,
             ),
         )
 
@@ -174,7 +176,8 @@ def asn(self, ip_address: IPAddress) -> ASN:
 
         """
         return cast(
-            ASN, self._flat_model_for(geoip2.models.ASN, "GeoLite2-ASN", ip_address)
+            ASN,
+            self._flat_model_for(geoip2.models.ASN, "GeoLite2-ASN", ip_address),
         )
 
     def connection_type(self, ip_address: IPAddress) -> ConnectionType:
@@ -188,7 +191,9 @@ def connection_type(self, ip_address: IPAddress) -> ConnectionType:
         return cast(
             ConnectionType,
             self._flat_model_for(
-                geoip2.models.ConnectionType, "GeoIP2-Connection-Type", ip_address
+                geoip2.models.ConnectionType,
+                "GeoIP2-Connection-Type",
+                ip_address,
             ),
         )
 
@@ -227,7 +232,8 @@ def isp(self, ip_address: IPAddress) -> ISP:
 
         """
         return cast(
-            ISP, self._flat_model_for(geoip2.models.ISP, "GeoIP2-ISP", ip_address)
+            ISP,
+            self._flat_model_for(geoip2.models.ISP, "GeoIP2-ISP", ip_address),
         )
 
     def _get(self, database_type: str, ip_address: IPAddress) -> Any:
@@ -253,13 +259,20 @@ def _model_for(
     ) -> Union[Country, Enterprise, City]:
         (record, prefix_len) = self._get(types, ip_address)
         return model_class(
-            self._locales, ip_address=ip_address, prefix_len=prefix_len, **record
+            self._locales,
+            ip_address=ip_address,
+            prefix_len=prefix_len,
+            **record,
         )
 
     def _flat_model_for(
         self,
         model_class: Union[
-            Type[Domain], Type[ISP], Type[ConnectionType], Type[ASN], Type[AnonymousIP]
+            Type[Domain],
+            Type[ISP],
+            Type[ConnectionType],
+            Type[ASN],
+            Type[AnonymousIP],
         ],
         types: str,
         ip_address: IPAddress,
@@ -278,5 +291,4 @@ def metadata(
 
     def close(self) -> None:
         """Closes the GeoIP2 database."""
-
         self._db_reader.close()

geoip2/errors.py

@@ -54,7 +54,6 @@ def __init__(
     @property
     def network(self) -> Optional[Union[ipaddress.IPv4Network, ipaddress.IPv6Network]]:
         """The network for the error"""
-
         if self.ip_address is None or self._prefix_len is None:
             return None
         return ipaddress.ip_network(f"{self.ip_address}/{self._prefix_len}", False)

geoip2/models.py

@@ -14,7 +14,8 @@
 # pylint: disable=too-many-instance-attributes,too-few-public-methods,too-many-arguments
 import ipaddress
 from abc import ABCMeta
-from typing import Dict, List, Optional, Sequence, Union
+from collections.abc import Sequence
+from typing import Dict, List, Optional, Union
 
 import geoip2.records
 from geoip2._internal import Model
@@ -94,10 +95,12 @@ def __init__(
         self.continent = geoip2.records.Continent(locales, **(continent or {}))
         self.country = geoip2.records.Country(locales, **(country or {}))
         self.registered_country = geoip2.records.Country(
-            locales, **(registered_country or {})
+            locales,
+            **(registered_country or {}),
         )
         self.represented_country = geoip2.records.RepresentedCountry(
-            locales, **(represented_country or {})
+            locales,
+            **(represented_country or {}),
         )
 
         self.maxmind = geoip2.records.MaxMind(**(maxmind or {}))
@@ -112,8 +115,8 @@ def __init__(
 
     def __repr__(self) -> str:
         return (
-            f"{self.__module__}.{self.__class__.__name__}({repr(self._locales)}, "
-            f"{', '.join(f'{k}={repr(v)}' for k, v in self.to_dict().items())})"
+            f"{self.__module__}.{self.__class__.__name__}({self._locales!r}, "
+            f"{', '.join(f'{k}={v!r}' for k, v in self.to_dict().items())})"
         )
 
 
@@ -387,15 +390,16 @@ def __repr__(self) -> str:
             f"{self.__module__}.{self.__class__.__name__}("
             + repr(str(self._ip_address))
             + ", "
-            + ", ".join(f"{k}={repr(v)}" for k, v in d.items())
+            + ", ".join(f"{k}={v!r}" for k, v in d.items())
             + ")"
         )
 
     @property
     def ip_address(self):
         """The IP address for the record"""
         if not isinstance(
-            self._ip_address, (ipaddress.IPv4Address, ipaddress.IPv6Address)
+            self._ip_address,
+            (ipaddress.IPv4Address, ipaddress.IPv6Address),
         ):
             self._ip_address = ipaddress.ip_address(self._ip_address)
         return self._ip_address

geoip2/records.py

@@ -11,7 +11,8 @@
 
 # pylint:disable=R0903
 from abc import ABCMeta
-from typing import Dict, Optional, Type, Sequence, Union
+from collections.abc import Sequence
+from typing import Dict, Optional, Type, Union
 
 from geoip2._internal import Model
 
@@ -113,7 +114,6 @@ class Continent(PlaceRecord):
 
     Attributes:
 
-
     .. attribute:: code
 
       A two character continent code like "NA" (North America)
@@ -167,7 +167,6 @@ class Country(PlaceRecord):
 
     Attributes:
 
-
     .. attribute:: confidence
 
       A value from 0-100 indicating MaxMind's confidence that
@@ -244,7 +243,6 @@ class RepresentedCountry(Country):
 
     Attributes:
 
-
     .. attribute:: confidence
 
       A value from 0-100 indicating MaxMind's confidence that
@@ -470,7 +468,11 @@ class Postal(Record):
     confidence: Optional[int]
 
     def __init__(
-        self, *, code: Optional[str] = None, confidence: Optional[int] = None, **_
+        self,
+        *,
+        code: Optional[str] = None,
+        confidence: Optional[int] = None,
+        **_,
     ) -> None:
         self.code = code
         self.confidence = confidence
@@ -556,7 +558,9 @@ class Subdivisions(tuple):
     """
 
     def __new__(
-        cls: Type["Subdivisions"], locales: Optional[Sequence[str]], *subdivisions
+        cls: Type["Subdivisions"],
+        locales: Optional[Sequence[str]],
+        *subdivisions,
     ) -> "Subdivisions":
         subobjs = tuple(Subdivision(locales, **x) for x in subdivisions)
         obj = super().__new__(cls, subobjs)  # type: ignore
@@ -923,7 +927,8 @@ def __init__(
     def ip_address(self):
         """The IP address for the record"""
         if not isinstance(
-            self._ip_address, (ipaddress.IPv4Address, ipaddress.IPv6Address)
+            self._ip_address,
+            (ipaddress.IPv4Address, ipaddress.IPv6Address),
         ):
             self._ip_address = ipaddress.ip_address(self._ip_address)
         return self._ip_address