Small changes required by older python versions

src/hidori_core/schema/base.py

@@ -123,6 +123,9 @@ class Schema:
  _internals_fields: Dict[str, Field]
 
  def __init_subclass__(cls) -> None:
+ # old pythons unfortunately
+ cls.__annotations__.pop("_internals_fields", "")
+
  for name in cls.__annotations__.keys():
  if name.startswith("_internals"):
  raise schema_errors.FieldNameNotAllowed(

tests/test_core/test_schema/test_fields.py

@@ -281,6 +281,12 @@ def test_schema_with_default_field_setup_and_validation(required, exc):
  [(True, schema_errors.ValidationError), (False, schema_errors.SkipFieldError)],
 )
 def test_dict_field_setup_and_validation(dict_type, required, exc):
+ # old pythons unfortunately
+ try:
+ dict_type[str, str]
+ except TypeError:
+ return
+
  assert schema_fields.Dictionary.from_annotation(Any, required) is None
  assert schema_fields.Dictionary.from_annotation(int, required) is None
  assert schema_fields.Dictionary.from_annotation(str, required) is None

tests/test_core/test_schema/test_modifiers.py

@@ -1,4 +1,4 @@
-from typing import Any, Literal
+from typing import Any, Dict, List, Literal, Optional
 
 import pytest
 
@@ -8,14 +8,14 @@
 
 
 class SimpleModifier(SchemaModifier):
- def __init__(self, data_conditions: list[DataCondtion] | None = None) -> None:
+ def __init__(self, data_conditions: Optional[List[DataCondtion]] = None) -> None:
  self.data_conditions = data_conditions or []
 
- def process_schema(self, annotations: dict[str, Any]) -> None:
+ def process_schema(self, annotations: Dict[str, Any]) -> None:
  if "throw_error" in annotations:
  raise schema_errors.ModifierError()
 
- def apply_to_schema(self, schema: Schema, data: dict[str, Any]) -> None:
+ def apply_to_schema(self, schema: Schema, data: Dict[str, Any]) -> None:
  if data["state"] == "modify":
  setattr(schema._internals_fields["a"], "modified", True)
  setattr(schema._internals_fields["b"], "modified", True)
@@ -36,7 +36,7 @@ class SimpleSchema(Schema):
 
 class OptionalSchema(Schema):
  a: str
- b: str | None
+ b: Optional[str]
 
 
 def test_simple_modifier_throw_error_on_schema_processing():