Fix lint

Author: LeanderCS

flask_inputfilter/conditions/__init__.py

@@ -25,6 +25,7 @@
 __all__ = [
     "ArrayLengthEqualCondition",
     "ArrayLongerThanCondition",
+    "AtLeastOneRequiredCondition",
     "BaseCondition",
     "CustomCondition",
     "EqualCondition",
@@ -33,6 +34,7 @@
     "ExactlyOneOfCondition",
     "ExactlyOneOfMatchesCondition",
     "IntegerBiggerThanCondition",
+    "MutuallyExclusiveCondition",
     "NOfCondition",
     "NOfMatchesCondition",
     "NotEqualCondition",
@@ -41,7 +43,4 @@
     "RequiredIfCondition",
     "StringLongerThanCondition",
     "TemporalOrderCondition",
-    # New conditions
-    "AtLeastOneRequiredCondition",
-    "MutuallyExclusiveCondition",
 ]

flask_inputfilter/conditions/at_least_one_required_condition.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-"""At least one field required condition."""
-
 from typing import Any, Dict, List, Optional
 
 from flask_inputfilter.models import BaseCondition
@@ -57,13 +55,19 @@ def check(self, data: Dict[str, Any]) -> bool:
 
         for field in self.fields:
             if field in data and data[field] is not None:
-                if self.check_empty and isinstance(data[field], str):
-                    if data[field].strip() == "":
-                        continue
-
-                if self.check_empty and isinstance(data[field], (list, dict)):
-                    if len(data[field]) == 0:
-                        continue
+                if (
+                    self.check_empty
+                    and isinstance(data[field], str)
+                    and data[field].strip() == ""
+                ):
+                    continue
+
+                if (
+                    self.check_empty
+                    and isinstance(data[field], (list, dict))
+                    and len(data[field]) == 0
+                ):
+                    continue
 
                 present_count += 1
 
@@ -104,11 +108,13 @@ def get_error_message(self, data: Dict[str, Any]) -> str:
                 missing_fields.append(field)
 
         if self.min_required == 1:
+            fields_list = ", ".join(self.fields)
             return (
-                f"At least one of the following fields is required: {', '.join(self.fields)}. "
+                f"At least one of the following fields is required: {fields_list}. "
                 f"None were provided or all were empty."
             )
+        fields_list = ", ".join(self.fields)
         return (
-            f"At least {self.min_required} of the following fields are required: "
-            f"{', '.join(self.fields)}. Only {len(present_fields)} provided."
+            f"At least {self.min_required} of the following fields "
+            f"are required: {fields_list}. Only {len(present_fields)} provided."
         )

flask_inputfilter/conditions/mutually_exclusive_condition.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-"""Mutually exclusive fields condition."""
-
 from typing import Any, Dict, List, Optional
 
 from flask_inputfilter.models import BaseCondition
@@ -103,9 +101,10 @@ def get_error_message(self, data: Dict[str, Any]) -> str:
                 )
 
         if len(present_groups) > 1:
+            groups_list = "; ".join(present_groups)
             return (
                 f"Fields are mutually exclusive. "
-                f"Only one group can be present, but found: {'; '.join(present_groups)}"
+                f"Only one group can be present, but found: {groups_list}"
             )
 
         if len(present_groups) == 0 and self.require_one:

flask_inputfilter/filters/__init__.py

@@ -46,6 +46,8 @@
     "BaseFilter",
     "BlacklistFilter",
     "LazyFilterChain",
+    "PhoneNumberNormalizeFilter",
+    "SanitizeHtmlFilter",
     "StringRemoveEmojisFilter",
     "StringSlugifyFilter",
     "StringTrimFilter",
@@ -73,7 +75,4 @@
     "TruncateFilter",
     "WhitelistFilter",
     "WhitespaceCollapseFilter",
-    # New filters
-    "PhoneNumberNormalizeFilter",
-    "SanitizeHtmlFilter",
 ]

flask_inputfilter/filters/phone_number_normalize_filter.py

@@ -1,9 +1,7 @@
 from __future__ import annotations
 
-"""Phone number normalization filter for international formats."""
-
 import re
-from typing import Any
+from typing import Any, ClassVar
 
 from flask_inputfilter.models import BaseFilter
 
@@ -16,7 +14,7 @@ class PhoneNumberNormalizeFilter(BaseFilter):
     can handle international and domestic numbers.
     """
 
-    COUNTRY_CODES = {
+    COUNTRY_CODES: ClassVar = {
         "US": {"code": "1", "length": 10, "format": "NPA-NXX-XXXX"},
         "CA": {"code": "1", "length": 10, "format": "NPA-NXX-XXXX"},
         "GB": {"code": "44", "length": 10, "format": "XXXX-XXXXXX"},
@@ -51,8 +49,9 @@ def __init__(
         Initialize the phone number normalizer.
 
         Args:
-            default_country: Default country code for numbers without country prefix
-            format: Output format ('E164', 'INTERNATIONAL', 'NATIONAL', 'RFC3966')
+            default_country: Default country code without country prefix
+            format: Output format ('E164', 'INTERNATIONAL', 'NATIONAL',
+                'RFC3966')
             remove_extension: Whether to remove extensions
             allow_alpha: Whether to allow alpha characters (1-800-FLOWERS)
             strict: Whether to enforce strict validation
@@ -127,9 +126,7 @@ def _clean_number(self, number: str) -> str:
         cleaned = re.sub(r"^0+(?=[1-9])", "", cleaned)
 
         cleaned = re.sub(r"^\+", "", cleaned)
-        cleaned = re.sub(r"^00", "", cleaned)
-
-        return cleaned
+        return re.sub(r"^00", "", cleaned)
 
     def _convert_alpha_to_digits(self, number: str) -> str:
         """Convert alpha characters to digits (for vanity numbers)."""
@@ -191,7 +188,7 @@ def _extract_extension(self, number: str) -> tuple:
 
     def _extract_country_code(self, number: str) -> tuple:
         """Extract country code from phone number."""
-        for country, info in self.COUNTRY_CODES.items():
+        for _country, info in self.COUNTRY_CODES.items():
             code = info["code"]
             if number.startswith(code):
                 remaining = number[len(code) :]
@@ -214,10 +211,12 @@ def _format_international(self, country_code: str, national: str) -> str:
         if country_code:
             if country_code == "1":
                 if len(national) == 10:
-                    return f"+{country_code} {national[:3]}-{national[3:6]}-{national[6:]}"
-            elif country_code == "44":
-                if len(national) == 10:
-                    return f"+{country_code} {national[:4]} {national[4:]}"
+                    return (
+                        f"+{country_code} {national[:3]}-"
+                        f"{national[3:6]}-{national[6:]}"
+                    )
+            elif country_code == "44" and len(national) == 10:
+                return f"+{country_code} {national[:4]} {national[4:]}"
 
             return f"+{country_code} {national}"
 
@@ -228,17 +227,19 @@ def _format_national(self, national: str, country: str) -> str:
         if country == "US" or country == "CA":
             if len(national) == 10:
                 return f"({national[:3]}) {national[3:6]}-{national[6:]}"
-        elif country == "GB":
-            if len(national) == 10:
-                return f"{national[:4]} {national[4:]}"
+        elif country == "GB" and len(national) == 10:
+            return f"{national[:4]} {national[4:]}"
 
         return national
 
     def _format_rfc3966(self, country_code: str, national: str) -> str:
         """Format as RFC3966 (tel:+1-234-567-8900)."""
         if country_code:
             if country_code == "1" and len(national) == 10:
-                return f"tel:+{country_code}-{national[:3]}-{national[3:6]}-{national[6:]}"
+                return (
+                    f"tel:+{country_code}-{national[:3]}-"
+                    f"{national[3:6]}-{national[6:]}"
+                )
             return f"tel:+{country_code}-{national}"
 
         return f"tel:{national}"

flask_inputfilter/filters/sanitize_html_filter.py

@@ -1,11 +1,9 @@
 from __future__ import annotations
 
-"""HTML sanitization filter for XSS protection."""
-
 import html
 import re
 from html.parser import HTMLParser
-from typing import Any, Dict, List, Optional
+from typing import Any, ClassVar, Dict, List, Optional
 
 from flask_inputfilter.models import BaseFilter
 
@@ -18,7 +16,7 @@ class SanitizeHtmlFilter(BaseFilter):
     attributes while preserving safe formatting.
     """
 
-    DEFAULT_ALLOWED_TAGS = {
+    DEFAULT_ALLOWED_TAGS: ClassVar = {
         "a",
         "abbr",
         "b",
@@ -62,7 +60,7 @@ class SanitizeHtmlFilter(BaseFilter):
         "figcaption",
     }
 
-    DEFAULT_ALLOWED_ATTRIBUTES = {
+    DEFAULT_ALLOWED_ATTRIBUTES: ClassVar = {
         "a": ["href", "title", "target", "rel"],
         "abbr": ["title"],
         "blockquote": ["cite"],
@@ -78,7 +76,7 @@ class SanitizeHtmlFilter(BaseFilter):
         "th": ["colspan", "rowspan"],
     }
 
-    DANGEROUS_PROTOCOLS = {
+    DANGEROUS_PROTOCOLS: ClassVar = {
         "javascript:",
         "data:",
         "vbscript:",
@@ -87,7 +85,7 @@ class SanitizeHtmlFilter(BaseFilter):
         "chrome:",
     }
 
-    EVENT_HANDLERS = {
+    EVENT_HANDLERS: ClassVar = {
         "onabort",
         "onblur",
         "onchange",
@@ -232,9 +230,7 @@ def apply(self, value: Any) -> str:
         parser.feed(value)
         result = parser.get_result()
 
-        result = self._additional_xss_protection(result)
-
-        return result
+        return self._additional_xss_protection(result)
 
     def _additional_xss_protection(self, html: str) -> str:
         """Apply additional XSS protection measures."""
@@ -251,15 +247,13 @@ def _additional_xss_protection(self, html: str) -> str:
         html = re.sub(
             r"<(\s*)script", "&lt;\\1script", html, flags=re.IGNORECASE
         )
-        html = re.sub(
+        return re.sub(
             r"<(\s*)/(\s*)script",
             "&lt;\\1/\\2script",
             html,
             flags=re.IGNORECASE,
         )
 
-        return html
-
 
 class HTMLSanitizerParser(HTMLParser):
     """HTML parser for sanitization."""

flask_inputfilter/validators/__init__.py

@@ -62,11 +62,14 @@
     "ArrayElementValidator",
     "ArrayLengthValidator",
     "BaseValidator",
+    "CreditCardValidator",
     "CustomJsonValidator",
     "DateAfterValidator",
     "DateBeforeValidator",
     "DateRangeValidator",
+    "FileSizeValidator",
     "FloatPrecisionValidator",
+    "IbanValidator",
     "InArrayValidator",
     "InEnumValidator",
     "IsArrayValidator",
@@ -76,6 +79,7 @@
     "IsDataclassValidator",
     "IsDateTimeValidator",
     "IsDateValidator",
+    "IsEmailValidator",
     "IsFloatValidator",
     "IsFutureDateValidator",
     "IsHexadecimalValidator",
@@ -84,6 +88,7 @@
     "IsImageValidator",
     "IsInstanceValidator",
     "IsIntegerValidator",
+    "IsIpAddressValidator",
     "IsJsonValidator",
     "IsLowercaseValidator",
     "IsMacAddressValidator",
@@ -102,14 +107,8 @@
     "NotInArrayValidator",
     "NotValidator",
     "OrValidator",
+    "PasswordStrengthValidator",
     "RangeValidator",
     "RegexValidator",
     "XorValidator",
-    # New validators
-    "CreditCardValidator",
-    "FileSizeValidator",
-    "IbanValidator",
-    "IsEmailValidator",
-    "IsIpAddressValidator",
-    "PasswordStrengthValidator",
 ]