Fix naming issues

mimesis/schema.py

@@ -22,14 +22,14 @@
 from mimesis.types import (
     JSON,
     CallableSchema,
-    FieldCache,
     Key,
     MissingSeed,
     Seed,
 )
 
 __all__ = ["BaseField", "Field", "Fieldset", "Schema"]
 
+FieldCache = dict[str, t.Callable[[t.Any], t.Any]]
 FieldHandler = t.Callable[[Random, t.Any], t.Any]
 RegisterableFieldHandler = tuple[str, FieldHandler]
 RegisterableFieldHandlers = t.Sequence[RegisterableFieldHandler]
@@ -51,7 +51,7 @@ def __init__(
         """
         self._generic = Generic(locale, seed)
         self._cache: FieldCache = {}
-        self._field_handlers: dict[str, FieldHandler] = {}
+        self._handlers: dict[str, FieldHandler] = {}
         self.aliases: dict[str, str] = {}
 
     def reseed(self, seed: Seed = MissingSeed) -> None:
@@ -189,8 +189,8 @@ def perform(
         random = self.get_random_instance()
 
         # First, try to find a custom field handler.
-        if name in self._field_handlers:
-            result = self._field_handlers[name](random, **kwargs)  # type: ignore
+        if name in self._handlers:
+            result = self._handlers[name](random, **kwargs)  # type: ignore
         else:
             result = self._lookup_method(name)(**kwargs)
 
@@ -225,8 +225,8 @@ def register_handler(self, field_name: str, field_handler: FieldHandler) -> None
         if len(callable_signature.parameters) <= 1:
             raise FieldArityError()
 
-        if field_name not in self._field_handlers:
-            self._field_handlers[field_name] = field_handler
+        if field_name not in self._handlers:
+            self._handlers[field_name] = field_handler
 
     def handle(
         self, field_name: str | None = None
@@ -265,7 +265,7 @@ def unregister_handler(self, field_name: str) -> None:
         :param field_name: Name of the field.
         """
 
-        self._field_handlers.pop(field_name, None)
+        self._handlers.pop(field_name, None)
 
     def unregister_handlers(self, field_names: t.Sequence[str] = ()) -> None:
         """Unregister a field handlers with given names.
@@ -282,7 +282,7 @@ def unregister_all_handlers(self) -> None:
 
         :return: None.
         """
-        self._field_handlers.clear()
+        self._handlers.clear()
 
     def __str__(self) -> str:
         return f"{self.__class__.__name__} <{self._generic.locale}>"

mimesis/types.py

@@ -20,7 +20,6 @@
     "CallableSchema",
     "Date",
     "DateTime",
-    "FieldCache",
     "JSON",
     "Key",
     "Keywords",
@@ -59,5 +58,3 @@ class _MissingSeed:
 CallableSchema = Callable[[], JSON]
 
 Key = Callable[[Any], Any] | None
-
-FieldCache = dict[str, Callable[[Any], Any]]

tests/test_schema.py

@@ -469,9 +469,9 @@ def test_unregister_handler(default_field):
     # Register fields first
     default_field.register_handler("my_field", my_field_handler)
     # Make sure that registration is done.
-    assert len(default_field._field_handlers.keys()) > 0
+    assert len(default_field._handlers.keys()) > 0
     # Extract field handler by its name
-    registered_field = default_field._field_handlers["my_field"]
+    registered_field = default_field._handlers["my_field"]
     # Make sure that handlers are the same
     assert registered_field == my_field_handler
     # Unregister field
@@ -490,16 +490,16 @@ def test_unregister_handlers(default_field):
 
     # Register fields first
     default_field.register_handlers(fields=fields)
-    assert len(default_field._field_handlers.keys()) == 3
+    assert len(default_field._handlers.keys()) == 3
 
     # Unregister all field with given names.
     default_field.unregister_handlers(["a", "b", "c", "d", "e"])
-    assert len(default_field._field_handlers.keys()) == 0
+    assert len(default_field._handlers.keys()) == 0
 
     # Register fields again and unregister all of them at once
     default_field.register_handlers(fields=fields)
     default_field.unregister_all_handlers()
-    assert len(default_field._field_handlers.keys()) == 0
+    assert len(default_field._handlers.keys()) == 0
 
 
 def test_unregister_all_handlers(default_field):
@@ -511,11 +511,11 @@ def test_unregister_all_handlers(default_field):
 
     # Register fields first
     default_field.register_handlers(fields=fields)
-    assert len(default_field._field_handlers.keys()) == 3
+    assert len(default_field._handlers.keys()) == 3
 
     # Unregister all fields
     default_field.unregister_all_handlers()
-    assert len(default_field._field_handlers.keys()) == 0
+    assert len(default_field._handlers.keys()) == 0
 
 
 def test_field_aliasing(default_field):