Merge branch 'fix'

# Conflicts: # nepattern/main.py # nepattern/util.py # pyproject.toml
ArcletProject · Sep 26, 2023 · 793b3f8 · 793b3f8
2 parents a7f53ed + 1481ab5
commit 793b3f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/nepattern/main.py b/nepattern/main.py
@@ -81,12 +81,11 @@ def parser(item: Any, extra: str = "allow") -> BasePattern:
     with suppress(TypeError):
         if item and (pat := all_patterns().get(item, None)):
             return pat
-    #with suppress(TypeError):
-    if not inspect.isclass(item) and isinstance(item, (GenericAlias, CGenericAlias, CUnionType)):
+    if isinstance(item, (GenericAlias, CGenericAlias, CUnionType)):
         return _generic_parser(item, extra)
     if isinstance(item, TypeVar):
         return _typevar_parser(item)
-    if inspect.isclass(item) and getattr(item, "_is_protocol", False):
+    if getattr(item, "_is_protocol", False):
         return _protocol_parser(item)
     if isinstance(item, (FunctionType, MethodType, LambdaType)):
         if len((sig := inspect.signature(item)).parameters) not in (1, 2):  # pragma: no cover

diff --git a/nepattern/util.py b/nepattern/util.py
@@ -8,11 +8,14 @@
 
 from tarina.lang import lang
 
-if sys.version_info >= (3, 10):  # pragma: no cover
+if sys.version_info >= (3, 9):  # pragma: no cover
     from types import GenericAlias as CGenericAlias  # noqa
-    from types import UnionType as CUnionType  # noqa
 else:
     CGenericAlias: type = type(List[int])  # noqa
+
+if sys.version_info >= (3, 10):   # pragma: no cover
+    from types import UnionType as CUnionType  # noqa
+else:
     CUnionType: type = type(Union[int, str])  # noqa
 
 if TYPE_CHECKING: