Autofixes from ruff

Author: oschwald

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # This file is execfile()d with the current directory set to its containing dir.
 #
@@ -9,8 +8,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

minfraud/__init__.py

@@ -7,14 +7,13 @@
 
 # flake8: noqa: F401
 from .errors import (
-    MinFraudError,
     AuthenticationError,
     HTTPError,
-    InvalidRequestError,
     InsufficientFundsError,
+    InvalidRequestError,
+    MinFraudError,
 )
-
-from .webservice import AsyncClient, Client
 from .version import __version__
+from .webservice import AsyncClient, Client
 
 __author__ = "Gregory Oschwald"

minfraud/models.py

@@ -7,11 +7,12 @@
 """
 
 # pylint:disable=too-many-lines,too-many-instance-attributes,too-many-locals
-from typing import Dict, List, Optional, Sequence
+from collections.abc import Sequence
+from typing import Dict, List, Optional
 
-from geoip2.mixins import SimpleEquality
 import geoip2.models
 import geoip2.records
+from geoip2.mixins import SimpleEquality
 
 
 class _Serializable(SimpleEquality):
@@ -112,7 +113,7 @@ class GeoIP2Location(geoip2.records.Location):
     local_time: Optional[str]
 
     def __init__(self, *args, **kwargs) -> None:
-        self.local_time = kwargs.get("local_time", None)
+        self.local_time = kwargs.get("local_time")
         super().__init__(*args, **kwargs)
 
 
@@ -1174,7 +1175,11 @@ class Reason(_Serializable):
     reason: Optional[str]
 
     def __init__(
-        self, *, code: Optional[str] = None, reason: Optional[str] = None, **_
+        self,
+        *,
+        code: Optional[str] = None,
+        reason: Optional[str] = None,
+        **_,
     ):
         self.code = code
         self.reason = reason

minfraud/request.py

@@ -5,11 +5,12 @@
 
 """
 
-import re
-import warnings
 import hashlib
+import re
 import unicodedata
+import warnings
 from typing import Any, Dict
+
 from voluptuous import MultipleInvalid
 
 from .errors import InvalidRequestError
@@ -345,7 +346,7 @@ def _clean_domain(domain):
 
     idx = domain.rfind(".")
     if idx != -1:
-        tld = domain[idx + 1 :]  # noqa
+        tld = domain[idx + 1 :]
         if tld in _TYPO_TLDS:
             domain = domain[:idx] + "." + _TYPO_TLDS.get(tld)
 
@@ -362,7 +363,7 @@ def _clean_email(address):
     if at_idx == -1:
         return None, None
 
-    domain = _clean_domain(address[at_idx + 1 :])  # noqa
+    domain = _clean_domain(address[at_idx + 1 :])
     local_part = address[:at_idx]
 
     local_part = unicodedata.normalize("NFC", local_part)

minfraud/validation.py

@@ -9,8 +9,8 @@
 
 import ipaddress
 import re
-import uuid
 import urllib.parse
+import uuid
 from decimal import Decimal
 from typing import Optional
 
@@ -31,7 +31,8 @@
 _custom_input_value = Any(
     All(str, Match(r"^[^\n]{1,255}\Z")),
     All(
-        _any_number, Range(min=-1e13, max=1e13, min_included=False, max_included=False)
+        _any_number,
+        Range(min=-1e13, max=1e13, min_included=False, max_included=False),
     ),
     bool,
 )
@@ -41,7 +42,8 @@
 _country_code = All(str, Match(r"^[A-Z]{2}$"))
 
 _telephone_country_code = Any(
-    All(str, Match("^[0-9]{1,4}$")), All(int, Range(min=1, max=9999))
+    All(str, Match("^[0-9]{1,4}$")),
+    All(int, Range(min=1, max=9999)),
 )
 
 _subdivision_iso_code = All(str, Match(r"^[0-9A-Z]{1,4}$"))
@@ -251,7 +253,7 @@ def _hostname(hostname: str) -> str:
         "windcave",
         "wirecard",
         "worldpay",
-    ]
+    ],
 )
 
 _single_char = Match("^[A-Za-z0-9]$")
@@ -268,7 +270,7 @@ def _credit_card_token(s: str) -> str:
 
 
 _rfc3339_datetime = Match(
-    r"(?a)\A\d{4}-\d{2}-\d{2}[Tt]\d{2}:\d{2}:\d{2}(\.\d+)?(?:[Zz]|[+-]\d{2}:\d{2})\Z"
+    r"(?a)\A\d{4}-\d{2}-\d{2}[Tt]\d{2}:\d{2}:\d{2}(\.\d+)?(?:[Zz]|[+-]\d{2}:\d{2})\Z",
 )
 
 
@@ -283,7 +285,7 @@ def _credit_card_token(s: str) -> str:
         "recurring_purchase",
         "referral",
         "survey",
-    ]
+    ],
 )
 
 _currency_code = Match("^[A-Z]{3}$")
@@ -416,7 +418,7 @@ def _validate_at_least_one_identifier_field(report):
         # voluptuous returns.
         raise MultipleInvalid(
             "The report must contain at least one of the following fields: "
-            "'ip_address', 'maxmind_id', 'minfraud_id', 'transaction_id'."
+            "'ip_address', 'maxmind_id', 'minfraud_id', 'transaction_id'.",
         )
     return True
 

minfraud/webservice.py

@@ -7,27 +7,27 @@
 """
 
 import json
+from collections.abc import Sequence
 from functools import partial
-from typing import Any, Callable, cast, Dict, Optional, Sequence, Union
+from typing import Any, Callable, Dict, Optional, Union, cast
 
 import aiohttp
 import aiohttp.http
 import requests
 import requests.utils
 from requests.models import Response
 
-from .version import __version__
 from .errors import (
-    MinFraudError,
-    HTTPError,
     AuthenticationError,
+    HTTPError,
     InsufficientFundsError,
     InvalidRequestError,
+    MinFraudError,
     PermissionRequiredError,
 )
 from .models import Factors, Insights, Score
 from .request import prepare_report, prepare_transaction
-
+from .version import __version__
 
 _AIOHTTP_UA = f"minFraud-API/{__version__} {aiohttp.http.SERVER_SOFTWARE}"
 
@@ -85,7 +85,11 @@ def _handle_success(
         return model_class(**decoded_body)  # type: ignore
 
     def _exception_for_error(
-        self, status: int, content_type: Optional[str], raw_body: str, uri: str
+        self,
+        status: int,
+        content_type: Optional[str],
+        raw_body: str,
+        uri: str,
     ) -> Union[
         AuthenticationError,
         InsufficientFundsError,
@@ -94,15 +98,18 @@ def _exception_for_error(
         PermissionRequiredError,
     ]:
         """Returns the exception for the error responses."""
-
         if 400 <= status < 500:
             return self._exception_for_4xx_status(status, content_type, raw_body, uri)
         if 500 <= status < 600:
             return self._exception_for_5xx_status(status, raw_body, uri)
         return self._exception_for_unexpected_status(status, raw_body, uri)
 
     def _exception_for_4xx_status(
-        self, status: int, content_type: Optional[str], raw_body: str, uri: str
+        self,
+        status: int,
+        content_type: Optional[str],
+        raw_body: str,
+        uri: str,
     ) -> Union[
         AuthenticationError,
         InsufficientFundsError,
@@ -113,7 +120,10 @@ def _exception_for_4xx_status(
         """Returns exception for error responses with 4xx status codes."""
         if not raw_body:
             return HTTPError(
-                f"Received a {status} error with no body", status, uri, raw_body
+                f"Received a {status} error with no body",
+                status,
+                uri,
+                raw_body,
             )
         if content_type is None or content_type.find("json") == -1:
             return HTTPError(
@@ -135,7 +145,10 @@ def _exception_for_4xx_status(
 
         if "code" in decoded_body and "error" in decoded_body:
             return self._exception_for_web_service_error(
-                decoded_body.get("error"), decoded_body.get("code"), status, uri
+                decoded_body.get("error"),
+                decoded_body.get("code"),
+                status,
+                uri,
             )
         return HTTPError(
             "Error response contains JSON but it does not "
@@ -147,7 +160,10 @@ def _exception_for_4xx_status(
 
     @staticmethod
     def _exception_for_web_service_error(
-        message: str, code: str, status: int, uri: str
+        message: str,
+        code: str,
+        status: int,
+        uri: str,
     ) -> Union[
         InvalidRequestError,
         AuthenticationError,
@@ -354,7 +370,9 @@ async def score(
         )
 
     async def report(
-        self, report: Dict[str, Optional[str]], validate: bool = True
+        self,
+        report: Dict[str, Optional[str]],
+        validate: bool = True,
     ) -> None:
         """Send a transaction report to the Report Transaction endpoint.
 
@@ -403,7 +421,9 @@ async def _response_for(
             return self._handle_success(raw_body, uri, model_class)
 
     async def _do_request(
-        self, uri: str, data: Dict[str, Any]
+        self,
+        uri: str,
+        data: Dict[str, Any],
     ) -> aiohttp.ClientResponse:
         session = await self._session()
         return await session.post(uri, json=data, proxy=self._proxy)
@@ -651,7 +671,10 @@ def _response_for(
 
     def _do_request(self, uri: str, data: Dict[str, Any]) -> Response:
         return self._session.post(
-            uri, json=data, timeout=self._timeout, proxies=self._proxies
+            uri,
+            json=data,
+            timeout=self._timeout,
+            proxies=self._proxies,
         )
 
     def close(self):

tests/test_models.py

@@ -291,7 +291,8 @@ def test_factors(self):
         self.assertEqual(0.01, factors.subscores.avs_result)
         self.assertEqual(0.02, factors.subscores.billing_address)
         self.assertEqual(
-            0.03, factors.subscores.billing_address_distance_to_ip_location
+            0.03,
+            factors.subscores.billing_address_distance_to_ip_location,
         )
         self.assertEqual(0.04, factors.subscores.browser)
         self.assertEqual(0.05, factors.subscores.chargeback)
@@ -309,7 +310,8 @@ def test_factors(self):
         self.assertEqual(0.15, factors.subscores.phone_number)
         self.assertEqual(0.2, factors.subscores.shipping_address)
         self.assertEqual(
-            0.16, factors.subscores.shipping_address_distance_to_ip_location
+            0.16,
+            factors.subscores.shipping_address_distance_to_ip_location,
         )
         self.assertEqual(0.17, factors.subscores.time_of_day)
 
@@ -365,9 +367,9 @@ def factors_response(self):
                         {
                             "code": "ANONYMOUS_IP",
                             "reason": "Risk due to IP being an Anonymous IP",
-                        }
+                        },
                     ],
-                }
+                },
             ],
         }
 
@@ -399,5 +401,6 @@ def check_risk_score_reasons_data(self, reasons):
         self.assertEqual(1, len(reasons[0].reasons))
         self.assertEqual("ANONYMOUS_IP", reasons[0].reasons[0].code)
         self.assertEqual(
-            "Risk due to IP being an Anonymous IP", reasons[0].reasons[0].reason
+            "Risk due to IP being an Anonymous IP",
+            reasons[0].reasons[0].reason,
         )