Allow shadowing of 'id' built-in

Author: oschwald

minfraud/request.py

@@ -271,7 +271,8 @@ def prepare_report(request: dict[str, Any], validate: bool) -> dict[str, Any]:
         try:
             validate_report(cleaned_request)
         except MultipleInvalid as ex:
-            raise InvalidRequestError(f"Invalid report data: {ex}") from ex
+            msg = f"Invalid report data: {ex}"
+            raise InvalidRequestError(msg) from ex
     return cleaned_request
 
 
@@ -286,7 +287,8 @@ def prepare_transaction(
         try:
             validate_transaction(cleaned_request)
         except MultipleInvalid as ex:
-            raise InvalidRequestError(f"Invalid transaction data: {ex}") from ex
+            msg = f"Invalid transaction data: {ex}"
+            raise InvalidRequestError(msg) from ex
 
     if hash_email:
         maybe_hash_email(cleaned_request)

minfraud/validation.py

@@ -307,7 +307,8 @@ def _credit_card_token(s: str) -> str:
 def _uri(s: str) -> str:
     parsed = urllib.parse.urlparse(s)
     if parsed.scheme not in ["http", "https"] or not parsed.netloc:
-        raise UrlInvalid("URL is invalid")
+        msg = "URL is invalid"
+        raise UrlInvalid(msg)
     return s
 
 

minfraud/webservice.py

@@ -144,7 +144,7 @@ def _exception_for_4xx_status(
         except ValueError:
             return HTTPError(
                 f"Received a {status} error but it did not "
-                + f"include the expected JSON body: {raw_body}",
+                f"include the expected JSON body: {raw_body}",
                 status,
                 uri,
                 raw_body,
@@ -288,7 +288,7 @@ async def factors(
           InvalidRequestError, HTTPError, MinFraudError,
         """
         return cast(
-            Factors,
+            "Factors",
             await self._response_for(
                 self._factors_uri,
                 partial(Factors, self._locales),
@@ -327,7 +327,7 @@ async def insights(
           InvalidRequestError, HTTPError, MinFraudError,
         """
         return cast(
-            Insights,
+            "Insights",
             await self._response_for(
                 self._insights_uri,
                 partial(Insights, self._locales),
@@ -366,7 +366,7 @@ async def score(
           InvalidRequestError, HTTPError, MinFraudError,
         """
         return cast(
-            Score,
+            "Score",
             await self._response_for(
                 self._score_uri,
                 Score,
@@ -546,7 +546,7 @@ def factors(
           InvalidRequestError, HTTPError, MinFraudError,
         """
         return cast(
-            Factors,
+            "Factors",
             self._response_for(
                 self._factors_uri,
                 partial(Factors, self._locales),
@@ -585,7 +585,7 @@ def insights(
           InvalidRequestError, HTTPError, MinFraudError,
         """
         return cast(
-            Insights,
+            "Insights",
             self._response_for(
                 self._insights_uri,
                 partial(Insights, self._locales),
@@ -624,7 +624,7 @@ def score(
           InvalidRequestError, HTTPError, MinFraudError,
         """
         return cast(
-            Score,
+            "Score",
             self._response_for(
                 self._score_uri,
                 Score,

pyproject.toml

@@ -86,6 +86,9 @@ ignore = [
     "PT027",
 ]
 
+[tool.ruff.lint.flake8-builtins]
+ignorelist = ["id"]
+
 [tool.ruff.lint.per-file-ignores]
 "minfraud/models,.py" = [ "D107", "PLR0913" ]
 "tests/*" = ["ANN201", "D"]

tests/test_webservice.py

@@ -218,7 +218,7 @@ def test_200(self) -> None:
         response = json.loads(self.response)
         cls = self.cls
         if self.has_ip_location():
-            cls = cast(Callable, partial(cls, ("en",)))
+            cls = cast("Callable", partial(cls, ("en",)))
         self.assertEqual(cls(**response), model)
         if self.has_ip_location():
             self.assertEqual("United Kingdom", model.ip_address.country.name)