feat: add python < 37 compatible type checks

arger/parser/parser.py

@@ -4,7 +4,8 @@
 from typing import Any, List, Set, Tuple
 
 from arger.parser.docstring import parse_docstring
-from arger.utils import match_types, portable_argspec
+from arger.typing_utils import match_types
+from arger.utils import portable_argspec
 
 
 def generate_options():

arger/typing_utils.py

@@ -0,0 +1,22 @@
+import sys
+
+
+NEW_TYPING = sys.version_info[:3] >= (3, 7, 0)  # PEP 560
+
+
+def _origin(tp):
+    """Return x.__origin__ or type(x) based on the Python version."""
+    if hasattr(tp, '_gorg'):
+        return tp._gorg
+    if getattr(tp, "__origin__", None) is not None:
+        return tp.__origin__
+    return tp
+
+
+def match_types(tp, *matches) -> bool:
+    """Match the given type to list of other types.
+
+    :param tp:
+    :param matches:
+    """
+    return any([_origin(m) is _origin(tp) for m in matches])

arger/utils.py

@@ -1,5 +1,4 @@
 import inspect
-from typing import Any, List, Tuple
 
 
 def portable_argspec(func):
@@ -32,19 +31,3 @@ def portable_argspec(func):
         kw_params,
         annotations,
     )
-
-
-def match_types(type, *matches):
-    """Match the given type to list of other types.
-
-    :param type:
-    :param matches:
-
-    >>> match_types(List, List[str], List, Tuple, Tuple[str], Tuple[Any])
-    True
-    >>> match_types(List[str], List[Any])
-    True
-    >>> match_types(List[str], List)
-    True
-    """
-    return any([str(m).startswith(str(type)) for m in matches])

pyproject.toml

@@ -73,6 +73,7 @@ tox = "^3.14.5"
 pyinotify = "^0.9.6"
 beautifulsoup4 = "^4.9.0"
 mistune = "2.0.0a2"
+pytest-lazy-fixture = "^0.6.3"
 
 [tool.black]
 

tests/test_dispatcher.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Any, Callable, List
 
 import pytest
 

tests/test_typing_utils.py

@@ -0,0 +1,31 @@
+from typing import Any, List, Tuple
+
+from pytest import fixture, mark
+from pytest_lazyfixture import lazy_fixture as lz
+
+from arger.typing_utils import match_types
+
+
+@fixture(params=[list, List, List[str], List[int], List[Any]])
+def list_type(request):
+    return request.param
+
+
+@fixture(
+    params=[tuple, Tuple, Tuple[str], Tuple[str, str], Tuple[int], Tuple[int, ...]]
+)
+def tuple_type(request):
+    return request.param
+
+
+@mark.parametrize(
+    'tp, tps, expected',
+    [
+        (lz('list_type'), lz('list_type'), True),
+        (lz('list_type'), lz('tuple_type'), False),
+        (lz('tuple_type'), lz('tuple_type'), True),
+        (lz('tuple_type'), lz('list_type'), False),
+    ],
+)
+def test_match_types(tp, tps, expected):
+    assert match_types(tp, tps) == expected