fix mypy

Author: aminalaee

tests/test_schemas.py

@@ -186,44 +186,51 @@ def test_schema_datetime_serialization():
     assert data["check_out"] is None
 
 
-#
-#
-# def test_schema_decimal_serialization():
-#     inventory_item = typesystem.Schema(fields={
-#         "name": typesystem.String(),
-#         "price": typesystem.Decimal(precision="0.01", allow_null=True),
-#     })
-#
-#     item = {"name": "Example", "price": 123.45}
-#
-#     assert item.price ==
-#     assert item["price"] == 123.45
-#
-#     item = InventoryItem(name="test")
-#     assert dict(item) == {"name": "test", "price": None}
-#     item = InventoryItem(name="test", price=0)
-#     assert dict(item) == {"name": "test", "price": 0}
-#
-#
-# def test_schema_uuid_serialization():
-#     class User(typesystem.Schema):
-#         id = typesystem.String(format="uuid")
-#         username = typesystem.String()
-#
-#     item = User(id="b769df4a-18ec-480f-89ef-8ea961a82269", username="tom")
-#
-#     assert item.id == uuid.UUID("b769df4a-18ec-480f-89ef-8ea961a82269")
-#     assert item["id"] == "b769df4a-18ec-480f-89ef-8ea961a82269"
-#
-#
-# def test_schema_with_callable_default():
-#     class Example(typesystem.Schema):
-#         created = typesystem.Date(default=datetime.date.today)
-#
-#     value, error = Example.validate_or_error({})
-#     assert value.created == datetime.date.today()
-#
-#
+def test_schema_decimal_serialization():
+    inventory = typesystem.Schema(
+        fields={
+            "name": typesystem.String(),
+            "price": typesystem.Decimal(precision="0.01", allow_null=True),
+        }
+    )
+
+    item = {"name": "example", "price": 123.45}
+    data = inventory.serialize(item)
+
+    assert data["name"] == "example"
+    assert data["price"] == 123.45
+
+    item = {"name": "example", "price": None}
+    assert inventory.serialize(item) == {"name": "example", "price": None}
+
+    item = {"name": "example", "price": 0}
+    assert inventory.serialize(item) == {"name": "example", "price": 0}
+
+
+def test_schema_uuid_serialization():
+    user = typesystem.Schema(
+        fields={
+            "id": typesystem.String(format="uuid"),
+            "username": typesystem.String(),
+        }
+    )
+
+    item = {"id": "b769df4a-18ec-480f-89ef-8ea961a82269", "username": "tom"}
+    data = user.serialize(item)
+
+    assert data["id"] == "b769df4a-18ec-480f-89ef-8ea961a82269"
+    assert data["username"] == "tom"
+
+
+def test_schema_with_callable_default():
+    schema = typesystem.Schema(
+        fields={"created": typesystem.Date(default=datetime.date.today)}
+    )
+
+    value, _ = schema.validate_or_error({})
+    assert value["created"] == datetime.date.today()
+
+
 # def test_nested_schema():
 #     class Artist(typesystem.Schema):
 #         name = typesystem.String(max_length=100)

typesystem/forms.py

@@ -34,29 +34,29 @@ def __init__(
         self,
         *,
         env: "jinja2.Environment",
-        schema: typing.Type[Schema],
+        schema: Schema,
         instance: typing.Any = None,
     ) -> None:
         self.env = env
         self.schema = schema
         self.instance = instance
         self.values = None if instance is None else self.schema.serialize(instance)
-        self.errors = None
+        self.errors: typing.Optional[typing.Dict[str, typing.Any]] = None
         self._validate_called = False
 
-    def validate(self, data: dict = None):
+    def validate(self, data: dict = None) -> None:
         assert not self._validate_called, "validate() has already been called."
         self.data = data
         self.values, self.errors = self.schema.validate_or_error(data)
         self._validate_called = True
 
     @property
-    def is_valid(self):
+    def is_valid(self) -> bool:
         assert self._validate_called, "validate() has not been called."
         return self.errors is None
 
     @property
-    def validated_data(self):
+    def validated_data(self) -> typing.Any:
         return self.values
 
     def render_fields(self) -> str:
@@ -156,7 +156,5 @@ def load_template_env(
             )
         return jinja2.Environment(loader=loader, autoescape=True)
 
-    def create_form(
-        self, schema: typing.Type[Schema], instance: typing.Any = None
-    ) -> Form:  # type: ignore
+    def create_form(self, schema: Schema, instance: typing.Any = None) -> Form:
         return Form(env=self.env, schema=schema, instance=instance)

typesystem/json_schema.py

@@ -408,6 +408,7 @@ def to_json_schema(
     elif isinstance(arg, NeverMatch):
         return False
 
+    field: typing.Optional[Field]
     data: dict = {}
     is_root = _definitions is None
     definitions = {} if _definitions is None else _definitions

typesystem/tokenize/positional_validation.py

@@ -7,7 +7,7 @@
 
 
 def validate_with_positions(
-    *, token: Token, validator: typing.Union[Field, typing.Type[Schema]]
+    *, token: Token, validator: typing.Union[Field, Schema]
 ) -> typing.Any:
     try:
         return validator.validate(token.value)

typesystem/tokenize/tokenize_json.py

@@ -182,7 +182,7 @@ def tokenize_json(content: typing.Union[str, bytes]) -> Token:
 
 def validate_json(
     content: typing.Union[str, bytes],
-    validator: typing.Union[Field, typing.Type[Schema]],
+    validator: typing.Union[Field, Schema],
 ) -> typing.Any:
     """
     Parse and validate a JSON string, returning positionally marked error