Merge pull request #465 from yukinarit/fix-more-type-errors

Fix more mypy type errors

Author: yukinarit

pyproject.toml

@@ -101,20 +101,20 @@ include = [
   "serde/yaml.py",
   "serde/pickle.py",
   "tests/test_custom.py",
+  "tests/test_kwonly.py",
+  "tests/test_flatten.py",
+  "tests/test_lazy_type_evaluation.py",
+  "tests/data.py",
 ]
 exclude = [
   "serde/numpy.py",
   "bench",
   "tests/common.py",
-  "tests/data.py",
   "tests/imported.py",
   "tests/test_basics.py",
   "tests/test_compat.py",
   "tests/test_core.py",
   "tests/test_de.py",
-  "tests/test_flatten.py",
-  "tests/test_kwonly.py",
-  "tests/test_lazy_type_evaluation.py",
   "tests/test_legacy_custom.py",
   "tests/test_literal.py",
   "tests/test_numpy.py",
@@ -134,15 +134,11 @@ exclude = [
   "examples/field_order.py",
   "bench",
   "tests/common.py",
-  "tests/data.py",
   "tests/imported.py",
   "tests/test_basics.py",
   "tests/test_compat.py",
   "tests/test_core.py",
   "tests/test_de.py",
-  "tests/test_flatten.py",
-  "tests/test_kwonly.py",
-  "tests/test_lazy_type_evaluation.py",
   "tests/test_legacy_custom.py",
   "tests/test_literal.py",
   "tests/test_numpy.py",

serde/compat.py

@@ -16,6 +16,7 @@
 from collections import defaultdict
 from dataclasses import is_dataclass
 from typing import (
+    NewType,
     Any,
     ClassVar,
     DefaultDict,
@@ -595,7 +596,7 @@ def is_bare_list(typ: Type[Any]) -> bool:
     return typ in (List, list)
 
 
-def is_tuple(typ: Type[Any]) -> bool:
+def is_tuple(typ: Any) -> bool:
     """
     Test if the type is `typing.Tuple`.
     """
@@ -768,7 +769,7 @@ def is_primitive_subclass(typ: Type[Any]) -> bool:
     return is_primitive(typ) and typ not in PRIMITIVES and not is_new_type_primitive(typ)
 
 
-def is_primitive(typ: Type[Any]) -> bool:
+def is_primitive(typ: Union[Type[Any], NewType]) -> bool:
     """
     Test if the type is primitive.
 
@@ -780,12 +781,12 @@ def is_primitive(typ: Type[Any]) -> bool:
     True
     """
     try:
-        return any(issubclass(typ, ty) for ty in PRIMITIVES)
+        return any(issubclass(typ, ty) for ty in PRIMITIVES)  # type: ignore
     except TypeError:
         return is_new_type_primitive(typ)
 
 
-def is_new_type_primitive(typ: Type[Any]) -> bool:
+def is_new_type_primitive(typ: Union[Type[Any], NewType]) -> bool:
     """
     Test if the type is a NewType of primitives.
     """

tests/common.py

@@ -19,7 +19,9 @@
     Set,
     Tuple,
     TypeVar,
+    Union,
 )
+from typing_extensions import TypeAlias
 
 import more_itertools
 
@@ -31,21 +33,23 @@
 from serde.yaml import from_yaml, to_yaml
 from tests import data
 
-format_dict: List = [(to_dict, from_dict)]
+FormatFuncs: TypeAlias = List[Tuple[Callable[..., Any], Callable[..., Any]]]
 
-format_tuple: List = [(to_tuple, from_tuple)]
+format_dict: FormatFuncs = [(to_dict, from_dict)]
 
-format_json: List = [(to_json, from_json)]
+format_tuple: FormatFuncs = [(to_tuple, from_tuple)]
 
-format_msgpack: List = [(to_msgpack, from_msgpack)]
+format_json: FormatFuncs = [(to_json, from_json)]
 
-format_yaml: List = [(to_yaml, from_yaml)]
+format_msgpack: FormatFuncs = [(to_msgpack, from_msgpack)]
 
-format_toml: List = [(to_toml, from_toml)]
+format_yaml: FormatFuncs = [(to_yaml, from_yaml)]
 
-format_pickle: List = [(to_pickle, from_pickle)]
+format_toml: FormatFuncs = [(to_toml, from_toml)]
 
-all_formats: List = (
+format_pickle: FormatFuncs = [(to_pickle, from_pickle)]
+
+all_formats: FormatFuncs = (
     format_dict
     + format_tuple
     + format_json
@@ -79,7 +83,10 @@ class NestedGenericClass(Generic[U, V]):
     b: Inner[V]
 
 
-def param(val, typ, filter: Optional[Callable] = None):
+Filter: TypeAlias = Callable[..., bool]
+
+
+def param(val: T, typ: U, filter: Optional[Filter] = None) -> Tuple[T, U, Filter]:
     """
     Create a test parameter
 
@@ -98,7 +105,7 @@ def yaml_not_supported(se: Any, de: Any, opt: Any) -> bool:
     return se is to_yaml
 
 
-types: List = [
+types: List[Tuple[Any, Any, Optional[Filter]]] = [
     param(10, int),  # Primitive
     param("foo", str),
     param(100.0, float),
@@ -179,14 +186,14 @@ def yaml_not_supported(se: Any, de: Any, opt: Any) -> bool:
     list(more_itertools.flatten(c)) for c in itertools.combinations(types, 2)
 ]
 
-opt_case: List = [
+opt_case: List[Dict[str, Union[bool, str]]] = [
     {"reuse_instances_default": False},
     {"reuse_instances_default": False, "rename_all": "camelcase"},
     {"reuse_instances_default": False, "rename_all": "snakecase"},
 ]
 
 
-def make_id_from_dict(d: Dict) -> str:
+def make_id_from_dict(d: Dict[str, str]) -> str:
     if not d:
         return "none"
     else:

tests/test_compat.py

@@ -30,7 +30,7 @@
 U = TypeVar("U")
 
 
-def test_types():
+def test_types() -> None:
     assert is_list(List[int])
     assert is_list(List)
     assert is_set(Set[int])
@@ -68,7 +68,7 @@ def test_types():
         assert is_opt(str | None)
 
 
-def test_typename():
+def test_typename() -> None:
     @serde.serde
     class Bar(Generic[T]):
         v: T
@@ -87,13 +87,13 @@ class Foo(Generic[T]):
     assert typename(Tuple[int, str]) == "Tuple[int, str]"
     assert typename(Tuple[int, ...]) == "Tuple[int, ...]"
     assert typename(Dict) == "Dict"
-    assert typename(Dict[str, Foo]) == "Dict[str, Foo]"
+    assert typename(Dict[str, Foo]) == "Dict[str, Foo]"  # type: ignore
     assert typename(Set) == "Set"
     assert typename(Set[int]) == "Set[int]"
-    assert typename(Literal[1, 1.0, "Hey"]) == "Literal[1, 1.0, Hey]"
+    assert typename(Literal[1, True, "Hey"]) == "Literal[1, True, Hey]"
 
 
-def test_iter_types():
+def test_iter_types() -> None:
     assert {Pri, int, str, float, bool} == set(iter_types(Pri))
     assert {Dict, str, Pri, int, float, bool} == set(iter_types(Dict[str, Pri]))
     assert {List, str} == set(iter_types(List[str]))
@@ -115,7 +115,7 @@ class Foo:
     assert {Foo, datetime, Optional, str, Union, List, Set, int} == set(iter_types(Foo))
 
 
-def test_iter_unions():
+def test_iter_unions() -> None:
     assert [Union[str, int]] == list(iter_unions(Union[str, int]))
     assert [Union[str, int]] == list(iter_unions(Dict[str, Union[str, int]]))
     assert [Union[str, int]] == list(iter_unions(Tuple[Union[str, int]]))
@@ -134,7 +134,7 @@ class A:
     )
 
 
-def test_type_args():
+def test_type_args() -> None:
     assert (int,) == type_args(List[int])
     assert (int, str) == type_args(Dict[int, str])
     assert (int, type(None)) == type_args(Optional[int])
@@ -151,13 +151,13 @@ def test_type_args():
         assert (int, Ellipsis) == type_args(tuple[int, ...])
 
 
-def test_union_args():
+def test_union_args() -> None:
     assert (int, str) == union_args(Union[int, str])
     assert (List[int], Dict[int, str]) == union_args(Union[List[int], Dict[int, str]])
     assert (Optional[int], str) == union_args(Union[Optional[int], str])
 
 
-def test_is_instance():
+def test_is_instance() -> None:
     # Primitive
     assert is_instance(10, int)
     assert is_instance("str", str)
@@ -257,7 +257,7 @@ class GenericFoo(Generic[T]):
     t: T
 
 
-def test_is_generic():
+def test_is_generic() -> None:
     assert not is_generic(int)
     assert not is_generic(List[int])
     assert not is_generic(List)
@@ -272,7 +272,7 @@ def test_is_generic():
     assert not serde.is_deserializable(GenericFoo[List[int]])
 
 
-def test_get_generic_arg():
+def test_get_generic_arg() -> None:
     class GenericFoo(Generic[T, U]):
         pass
 

tests/test_flatten.py

@@ -2,7 +2,7 @@
 Tests for flatten attribute.
 """
 
-from typing import Dict, List
+from typing import Dict, List, Any
 
 import pytest
 
@@ -12,7 +12,7 @@
 from .common import all_formats
 
 
-def test_flatten_simple():
+def test_flatten_simple() -> None:
     @serde
     class Bar:
         c: float
@@ -31,7 +31,7 @@ class Foo:
 
 
 @pytest.mark.parametrize("se,de", all_formats)
-def test_flatten(se, de):
+def test_flatten(se: Any, de: Any) -> None:
     @serde
     class Baz:
         e: List[int]

tests/test_kwonly.py

@@ -10,7 +10,7 @@
 @pytest.mark.skipif(
     sys.version_info < (3, 10), reason="dataclasses `kw_only` requires python3.10 or higher"
 )
-def test_simple():
+def test_simple() -> None:
     @deserialize
     @dataclass(kw_only=True)
     class Hello:
@@ -22,7 +22,7 @@ class Hello:
 @pytest.mark.skipif(
     sys.version_info < (3, 10), reason="dataclasses `kw_only` requires python3.10 or higher"
 )
-def test_inheritance():
+def test_inheritance() -> None:
     @dataclass(kw_only=True)
     class Friend:
         name: str = "MyFriend"

tests/test_lazy_type_evaluation.py

@@ -30,7 +30,7 @@ class B:
 
 
 # only works with global classes
-def test_serde_with_lazy_type_annotations():
+def test_serde_with_lazy_type_annotations() -> None:
     a = A(1, Status.ERR, ["foo"])
     a_dict = {"a": 1, "b": "err", "c": ["foo"]}
 
@@ -57,7 +57,8 @@ class ForwardReferenceBar:
 
 
 # assert type is str
-assert "ForwardReferenceBar" == dataclasses.fields(ForwardReferenceFoo)[0].type
+typ = dataclasses.fields(ForwardReferenceFoo)[0].type
+assert isinstance(typ, str) and "ForwardReferenceBar" == typ
 
 # setup pyserde for Foo after Bar becomes visible to global scope
 deserialize(ForwardReferenceFoo)
@@ -69,7 +70,7 @@ class ForwardReferenceBar:
 
 
 # verify usage works
-def test_forward_reference_works():
+def test_forward_reference_works() -> None:
     h = ForwardReferenceFoo(bar=ForwardReferenceBar(i=10))
     h_dict = {"bar": {"i": 10}}
 
@@ -78,7 +79,7 @@ def test_forward_reference_works():
 
 
 # trying to use forward reference normally will throw
-def test_unresolved_forward_reference_throws():
+def test_unresolved_forward_reference_throws() -> None:
     with pytest.raises(SerdeError) as e:
 
         @serde
@@ -93,7 +94,7 @@ class UnresolvedForwardBar:
 
 
 # trying to use string forward reference will throw
-def test_string_forward_reference_throws():
+def test_string_forward_reference_throws() -> None:
     with pytest.raises(SerdeError) as e:
 
         @serde