Merge branch 'develop' into dependabot/github_actions/actions/setup-p…

…ython-5

src/filters/__init__.py

@@ -1,16 +1,99 @@
 # Make the base filters accessible from the top level of the package.
 # Note that the order is important here, due to dependencies.
-from .base import *
-from .handlers import *
-from .macros import *
-from .number import *
-from .simple import *
-from .complex import *
-from .string import *
-
 # Additional filters are loaded into a separate namespace, so that IDEs
 # don't go insane.
-from filters.extensions import FilterExtensionRegistry
+from .base import Type
+from .complex import (
+    FilterMapper,
+    FilterRepeater,
+    FilterSwitch,
+    NamedTuple,
+)
+from .extensions import FilterExtensionRegistry
+from .number import (
+    Decimal,
+    Int,
+    Max,
+    Min,
+    Round,
+)
+from .simple import (
+    Array,
+    ByteArray,
+    Call,
+    Date,
+    Datetime,
+    Empty,
+    Item,
+    Length,
+    MaxLength,
+    MinLength,
+    NoOp,
+    NotEmpty,
+    Omit,
+    Optional,
+    Pick,
+    Required,
+)
+from .string import (
+    Base64Decode,
+    ByteString,
+    CaseFold,
+    Choice,
+    IpAddress,
+    JsonDecode,
+    MaxBytes,
+    MaxChars,
+    Regex,
+    Split,
+    Strip,
+    Unicode,
+    Uuid,
+)
+
+__all__ = [
+    "Array",
+    "Base64Decode",
+    "ByteArray",
+    "ByteString",
+    "Call",
+    "CaseFold",
+    "Choice",
+    "Date",
+    "Datetime",
+    "Decimal",
+    "Empty",
+    "FilterMapper",
+    "FilterRepeater",
+    "FilterSwitch",
+    "Int",
+    "IpAddress",
+    "Item",
+    "JsonDecode",
+    "Length",
+    "Max",
+    "MaxBytes",
+    "MaxChars",
+    "MaxLength",
+    "Min",
+    "MinLength",
+    "NamedTuple",
+    "NoOp",
+    "NotEmpty",
+    "Omit",
+    "Optional",
+    "Pick",
+    "Regex",
+    "Required",
+    "Round",
+    "Split",
+    "Strip",
+    "Type",
+    "Unicode",
+    "Uuid",
+    "ext",
+]
 
+# Initialise extensions namespace.
 ext = FilterExtensionRegistry()
 del FilterExtensionRegistry

src/filters/base.py

@@ -15,7 +15,7 @@
 ]
 
 FilterCompatible = typing.Optional[
-    typing.Union["BaseFilter", "FilterMeta", typing.Callable[[], "BaseFilter"]]
+    typing.Union["BaseFilter", "FilterMeta", typing.Callable[..., "BaseFilter"]]
 ]
 """
 Used in PEP-484 type hints to indicate a value that can be normalized

src/filters/complex.py

@@ -246,7 +246,7 @@ def __str__(self):
             type=type(self).__name__,
             filters=", ".join(
                 "{key}={filter}".format(key=key, filter=filter_chain)
-                for key, filter_chain in self._filters.items()
+                    for key, filter_chain in self._filters.items()
             ),
         )
 

src/filters/macros.py

@@ -1,4 +1,5 @@
-from abc import ABCMeta
+import typing
+from abc import ABC
 from functools import WRAPPER_ASSIGNMENTS, partial
 
 from filters.base import BaseFilter, FilterMeta
@@ -9,7 +10,7 @@
 ]
 
 
-class FilterMacroType(BaseFilter, metaclass=ABCMeta):
+class FilterMacroType(BaseFilter, ABC):
     """
     Base type for filter macros.  Doesn't do anything on its own, but
     it is useful for identifying filter macros when paired with an
@@ -33,7 +34,7 @@ def MyMacro():
     pass
 
 
-def filter_macro(func, *args, **kwargs):
+def filter_macro(func, *args, **kwargs) -> typing.Type[FilterMacroType]:
     """
     Promotes a function that returns a filter into its own filter type.
 

src/filters/simple.py

@@ -555,7 +555,7 @@ def __str__(self):
     def _apply(self, value):
         if len(value) > self.max_length:
             if self.truncate:
-                return value[0 : self.max_length]
+                return value[0: self.max_length]
 
             return self._invalid_value(
                 value=value,
@@ -773,7 +773,7 @@ def __init__(
         self.default = (
             staticmethod(default).__wrapped__
             if self.call_default is True
-            or (self.call_default is None and callable(default))
+               or (self.call_default is None and callable(default))
             else default
         )
 
@@ -807,7 +807,7 @@ def _get_default(self):
         return (
             self.default()
             if self.call_default is True
-            or (self.call_default is None and callable(self.default))
+               or (self.call_default is None and callable(self.default))
             else self.default
         )
 

src/filters/string.py

@@ -312,7 +312,7 @@ class MaxBytes(BaseFilter[bytes]):
 
     templates = {
         CODE_TOO_LONG: "Value is too long (must be < {max_bytes} "
-        "bytes when encoded using {encoding}).",
+                       "bytes when encoded using {encoding}).",
     }
 
     def __init__(
@@ -505,7 +505,7 @@ def truncate_bytes(self, bytes_value: bytes) -> bytes:
                 # Progressively chop bytes off the end of the string until we
                 # have something that can be successfully decoded using the
                 # specified encoding.
-                truncated = bytes_value[0 : target_bytes - trim]
+                truncated = bytes_value[0: target_bytes - trim]
 
                 try:
                     truncated.decode(self.encoding)
@@ -603,7 +603,7 @@ def _apply(self, value):
                 # Edge case where ``self.max_chars`` isn't big enough to fit
                 # even ``self.suffix`` by itself.
                 if target_chars < 0:
-                    return self.suffix[0 : self.max_chars]
+                    return self.suffix[0: self.max_chars]
 
                 return (self.prefix + value)[0:target_chars] + self.suffix
 

src/filters/test.py

@@ -5,7 +5,7 @@
 from traceback import format_exception
 from unittest import TestCase
 
-from filters.base import BaseFilter
+from filters.base import FilterCompatible
 from filters.handlers import FilterRunner
 
 __all__ = [
@@ -40,7 +40,7 @@ class BaseFilterTestCase(TestCase):
     ``assertFilterErrors`` to check use cases.
     """
 
-    filter_type: typing.Callable[[...], BaseFilter] = None
+    filter_type: FilterCompatible = None
 
     class unmodified(object):
         """

test/__init__.py

@@ -1,9 +1,11 @@
 import typing
 
 import filters as f
+from filters.base import BaseFilter
+from filters.macros import filter_macro
 
 
-class FilterAlpha(f.BaseFilter):
+class FilterAlpha(BaseFilter):
     """
     A filter that can be used for testing.
     """
@@ -12,7 +14,7 @@ def _apply(self, value):
         return value
 
 
-class FilterBravo(f.BaseFilter):
+class FilterBravo(BaseFilter):
     """
     A filter that will can be used for testing.
     """
@@ -26,7 +28,7 @@ def _apply(self, value):
         return value
 
 
-@f.filter_macro
+@filter_macro
 def FilterCharlie():
     """
     A filter macro that can be used for testing.

test/helper.py

@@ -12,15 +12,15 @@ class DummyDistributionFinder(DistributionFinder):
     virtualenv.
     """
 
-    DUMMY_PACKAGE_DIR = 'filter_extension.egg-info'
+    DUMMY_PACKAGE_DIR = "filter_extension.egg-info"
 
     @classmethod
     def install(cls):
         for finder in sys.meta_path:
             if isinstance(finder, cls):
                 # If we've already installed an instance of the class, then
                 # something is probably wrong with our tests.
-                raise ValueError(f'{cls.__name__} is already installed')
+                raise ValueError(f"{cls.__name__} is already installed")
 
         sys.meta_path.append(cls())
 
@@ -33,9 +33,11 @@ def uninstall(cls):
         else:
             # If we didn't find an installed instance of the class, then
             # something is probably wrong with our tests.
-            raise ValueError(f'{cls.__name__} was not installed')
+            raise ValueError(f"{cls.__name__} was not installed")
 
     def find_distributions(self, context=...) -> list[PathDistribution]:
-        return [PathDistribution(
-            Path(path.join(path.dirname(__file__), self.DUMMY_PACKAGE_DIR))
-        )]
+        return [
+            PathDistribution(
+                Path(path.join(path.dirname(__file__), self.DUMMY_PACKAGE_DIR))
+            )
+        ]