Merge pull request #5 from pomponchik/develop

0.0.5

Author: pomponchik

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simtypes"
-version = "0.0.4"
+version = "0.0.5"
 authors = [{ name = "Evgeniy Blinov", email = "zheni-b@yandex.ru" }]
 description = 'Type checking in runtime without stupid games'
 readme = "README.md"

simtypes/check.py

@@ -30,12 +30,18 @@ def check(value: Any, type: Type[ExpectedType], strict: bool = False, lists_are_
     elif origin_type is list and strict:
         if not isinstance(value, list):
             return False
-        return all(check(subvalue, get_args(type)[0], strict=strict, lists_are_tuples=lists_are_tuples) for subvalue in value)
+        arguments = get_args(type)
+        if not arguments:
+            return True
+        return all(check(subvalue, arguments[0], strict=strict, lists_are_tuples=lists_are_tuples) for subvalue in value)
 
     elif origin_type is dict and strict:
         if not isinstance(value, dict):
             return False
-        return all(check(key, get_args(type)[0], strict=strict, lists_are_tuples=lists_are_tuples) and check(subvalue, get_args(type)[1], strict=strict, lists_are_tuples=lists_are_tuples) for key, subvalue in value.items())
+        arguments = get_args(type)
+        if not arguments:
+            return True
+        return all(check(key, arguments[0], strict=strict, lists_are_tuples=lists_are_tuples) and check(subvalue, arguments[1], strict=strict, lists_are_tuples=lists_are_tuples) for key, subvalue in value.items())
 
     elif origin_type is tuple and strict:
         types_to_check: List[Union[Type[list], Type[tuple]]] = [tuple] if not lists_are_tuples else [tuple, list]
@@ -48,7 +54,7 @@ def check(value: Any, type: Type[ExpectedType], strict: bool = False, lists_are_
             return True
 
         if len(arguments) == 2 and arguments[1] is Ellipsis:
-            return all(check(subvalue, get_args(type)[0], strict=strict, lists_are_tuples=lists_are_tuples) for subvalue in value)
+            return all(check(subvalue, arguments[0], strict=strict, lists_are_tuples=lists_are_tuples) for subvalue in value)
 
         if len(arguments) != len(value):
             return False

tests/units/conftest.py

@@ -0,0 +1,66 @@
+import sys
+from typing import Tuple, List, Set, Dict, Union, Optional
+
+import pytest
+
+
+@pytest.fixture(params=[1, 2])
+def new_style(request):
+    return request.param
+
+
+@pytest.fixture(params=[Dict, dict])
+def dict_type(request):
+    return request.param
+
+
+@pytest.fixture(params=[List, list])
+def list_type(request):
+    return request.param
+
+
+@pytest.fixture(params=[Tuple, tuple])
+def tuple_type(request):
+    return request.param
+
+
+@pytest.fixture(params=[Set, set])
+def set_type(request):
+    return request.param
+
+
+@pytest.fixture(params=[True, False])
+def make_union(request):
+    def function(first, second):
+        if request.param:
+            return first | second
+        return Union[first, second]
+    if request.param and sys.version_info < (3, 10):
+        pytest.skip('This operation became available in Python 3.10')
+    return function
+
+
+@pytest.fixture(params=[True, False])
+def make_optional(request):
+    def function(hint):
+        if request.param:
+            return hint | None
+        return Optional[hint]
+    if request.param and sys.version_info < (3, 10):
+        pytest.skip('Union type expressions appeared in Python 3.10')
+    return function
+
+
+@pytest.fixture(params=([List] if sys.version_info < (3, 9) else [List, list]))
+def subscribable_list_type(request):
+    return request.param
+
+
+@pytest.fixture(params=([Dict] if sys.version_info < (3, 9) else [Dict, dict]))
+def subscribable_dict_type(request):
+    return request.param
+
+
+@pytest.fixture(params=([Tuple] if sys.version_info < (3, 9) else [Tuple, tuple]))  # type: ignore[list-item]
+def subscribable_tuple_type(request):
+    return request.param