Merge pull request #99 from maxmind/greg/use-f-strings

Clean up string formatting

Author: rafl

geoip2/database.py

@@ -220,13 +220,12 @@ def _get(self, database_type: str, ip_address: IPAddress) -> Any:
         if database_type not in self._db_type:
             caller = inspect.stack()[2][3]
             raise TypeError(
-                "The %s method cannot be used with the "
-                "%s database" % (caller, self._db_type)
+                f"The {caller} method cannot be used with the {self._db_type} database",
             )
         (record, prefix_len) = self._db_reader.get_with_prefix_len(ip_address)
         if record is None:
             raise geoip2.errors.AddressNotFoundError(
-                "The address %s is not in the database." % ip_address
+                f"The address {ip_address} is not in the database.",
             )
         return record, prefix_len
 

geoip2/models.py

@@ -99,11 +99,8 @@ def __init__(
         self.raw = raw_response
 
     def __repr__(self) -> str:
-        return "{module}.{class_name}({data}, {locales})".format(
-            module=self.__module__,
-            class_name=self.__class__.__name__,
-            data=self.raw,
-            locales=self._locales,
+        return (
+            f"{self.__module__}.{self.__class__.__name__}({self.raw}, {self._locales})"
         )
 
 
@@ -336,12 +333,7 @@ def __init__(self, raw: Dict[str, Union[bool, str, int]]) -> None:
         self.ip_address = cast(str, raw.get("ip_address"))
 
     def __repr__(self) -> str:
-        # pylint: disable=no-member
-        return "{module}.{class_name}({data})".format(
-            module=self.__module__,
-            class_name=self.__class__.__name__,
-            data=str(self.raw),
-        )
+        return f"{self.__module__}.{self.__class__.__name__}({self.raw})"
 
     @property
     def network(self) -> Optional[Union[ipaddress.IPv4Network, ipaddress.IPv6Network]]:
@@ -356,7 +348,7 @@ def network(self) -> Optional[Union[ipaddress.IPv4Network, ipaddress.IPv6Network
         prefix_len = self._prefix_len
         if ip_address is None or prefix_len is None:
             return None
-        network = ipaddress.ip_network("{}/{}".format(ip_address, prefix_len), False)
+        network = ipaddress.ip_network(f"{ip_address}/{prefix_len}", False)
         self._network = network
         return network
 

geoip2/records.py

@@ -20,9 +20,7 @@ class Record(SimpleEquality, metaclass=ABCMeta):
 
     def __repr__(self) -> str:
         args = ", ".join("%s=%r" % x for x in self.__dict__.items())
-        return "{module}.{class_name}({data})".format(
-            module=self.__module__, class_name=self.__class__.__name__, data=args
-        )
+        return f"{self.__module__}.{self.__class__.__name__}({args})"
 
 
 class PlaceRecord(Record, metaclass=ABCMeta):
@@ -98,7 +96,7 @@ def __init__(
         confidence: Optional[int] = None,
         geoname_id: Optional[int] = None,
         names: Optional[Dict[str, str]] = None,
-        **_
+        **_,
     ) -> None:
         self.confidence = confidence
         self.geoname_id = geoname_id
@@ -152,7 +150,7 @@ def __init__(
         code: Optional[str] = None,
         geoname_id: Optional[int] = None,
         names: Optional[Dict[str, str]] = None,
-        **_
+        **_,
     ) -> None:
         self.code = code
         self.geoname_id = geoname_id
@@ -224,7 +222,7 @@ def __init__(
         is_in_european_union: bool = False,
         iso_code: Optional[str] = None,
         names: Optional[Dict[str, str]] = None,
-        **_
+        **_,
     ) -> None:
         self.confidence = confidence
         self.geoname_id = geoname_id
@@ -307,7 +305,7 @@ def __init__(
         names: Optional[Dict[str, str]] = None,
         # pylint:disable=redefined-builtin
         type: Optional[str] = None,
-        **_
+        **_,
     ) -> None:
         self.type = type
         super().__init__(
@@ -399,7 +397,7 @@ def __init__(
         metro_code: Optional[int] = None,
         population_density: Optional[int] = None,
         time_zone: Optional[str] = None,
-        **_
+        **_,
     ) -> None:
         self.average_income = average_income
         self.accuracy_radius = accuracy_radius
@@ -527,7 +525,7 @@ def __init__(
         geoname_id: Optional[int] = None,
         iso_code: Optional[str] = None,
         names: Optional[Dict[str, str]] = None,
-        **_
+        **_,
     ) -> None:
         self.confidence = confidence
         self.geoname_id = geoname_id
@@ -842,7 +840,7 @@ def __init__(
         static_ip_score: Optional[float] = None,
         user_count: Optional[int] = None,
         user_type: Optional[str] = None,
-        **_
+        **_,
     ) -> None:
         self.autonomous_system_number = autonomous_system_number
         self.autonomous_system_organization = autonomous_system_organization
@@ -880,7 +878,7 @@ def network(self) -> Optional[Union[ipaddress.IPv4Network, ipaddress.IPv6Network
             prefix_len = self._prefix_len
             if ip_address is None or prefix_len is None:
                 return None
-            network = "{}/{}".format(ip_address, prefix_len)
+            network = f"{ip_address}/{prefix_len}"
         network = ipaddress.ip_network(network, False)
         self._network = network
         return network  # type: ignore

geoip2/webservice.py

@@ -48,13 +48,12 @@
 from geoip2.models import City, Country, Insights
 from geoip2.types import IPAddress
 
-_AIOHTTP_UA = "GeoIP2-Python-Client/%s %s" % (
-    geoip2.__version__,
-    aiohttp.http.SERVER_SOFTWARE,
+_AIOHTTP_UA = (
+    f"GeoIP2-Python-Client/{geoip2.__version__} {aiohttp.http.SERVER_SOFTWARE}"
 )
-_REQUEST_UA = "GeoIP2-Python-Client/%s %s" % (
-    geoip2.__version__,
-    requests.utils.default_user_agent(),
+
+_REQUEST_UA = (
+    f"GeoIP2-Python-Client/{geoip2.__version__} {requests.utils.default_user_agent()}"
 )
 
 
@@ -85,7 +84,7 @@ def __init__(
             account_id if isinstance(account_id, bytes) else str(account_id)
         )
         self._license_key = license_key
-        self._base_uri = "https://%s/geoip/v2.1" % host
+        self._base_uri = f"https://{host}/geoip/v2.1"
         self._timeout = timeout
 
     def _uri(self, path: str, ip_address: IPAddress) -> str:
@@ -99,9 +98,9 @@ def _handle_success(body: str, uri: str) -> Any:
             return json.loads(body)
         except ValueError as ex:
             raise GeoIP2Error(
-                "Received a 200 response for %(uri)s"
+                f"Received a 200 response for {uri}"
                 " but could not decode the response as "
-                "JSON: " % locals() + ", ".join(ex.args),
+                "JSON: " + ", ".join(ex.args),
                 200,
                 uri,
             ) from ex
@@ -120,15 +119,14 @@ def _exception_for_4xx_status(
     ) -> GeoIP2Error:
         if not body:
             return HTTPError(
-                "Received a %(status)i error for %(uri)s " "with no body." % locals(),
+                f"Received a {status} error for {uri} with no body.",
                 status,
                 uri,
                 body,
             )
         if content_type.find("json") == -1:
             return HTTPError(
-                "Received a %i for %s with the following "
-                "body: %s" % (status, uri, str(content_type)),
+                f"Received a {status} for {uri} with the following body: {body}",
                 status,
                 uri,
                 body,
@@ -137,8 +135,9 @@ def _exception_for_4xx_status(
             decoded_body = json.loads(body)
         except ValueError as ex:
             return HTTPError(
-                "Received a %(status)i error for %(uri)s but it did"
-                " not include the expected JSON body: " % locals() + ", ".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,
@@ -149,7 +148,7 @@ def _exception_for_4xx_status(
                     decoded_body.get("error"), decoded_body.get("code"), status, uri
                 )
             return HTTPError(
-                "Response contains JSON but it does not specify " "code or error keys",
+                "Response contains JSON but it does not specify code or error keys",
                 status,
                 uri,
                 body,
@@ -188,7 +187,7 @@ def _exception_for_5xx_status(
         status: int, uri: str, body: Optional[str]
     ) -> HTTPError:
         return HTTPError(
-            "Received a server error (%(status)i) for " "%(uri)s" % locals(),
+            f"Received a server error ({status}) for {uri}",
             status,
             uri,
             body,
@@ -199,8 +198,7 @@ def _exception_for_non_200_status(
         status: int, uri: str, body: Optional[str]
     ) -> HTTPError:
         return HTTPError(
-            "Received a very surprising HTTP status "
-            "(%(status)i) for %(uri)s" % locals(),
+            f"Received a very surprising HTTP status ({status}) for {uri}",
             status,
             uri,
             body,