fix: get_origin for generic Union in 3.6

PrettyWood · Mar 13, 2021 · d603d16 · d603d16
1 parent fd10f52
commit d603d16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tests/test_typing_compat.py b/tests/test_typing_compat.py
@@ -133,6 +133,7 @@ def test_get_args(tp, expected_args):
         (Generic, Generic),
         (Generic[T], Generic),
         (Union[T, int], Union),
+        (Union[T, int][str], Union),
         (List[Tuple[T, T]][int], list),
         (StrangePair[int, str], StrangePair),
         (Callable, collections.abc.Callable),

diff --git a/typingx/typing_compat.py b/typingx/typing_compat.py
@@ -128,10 +128,11 @@ def T_get_origin(tp: TypeLike) -> T.Optional[TypeLike]:
             T.Type: type,
         }
 
-        if hasattr(tp, "_gorg"):
-            origin = tp._gorg
-        else:
-            origin = getattr(tp, "__origin__", None)
+        origin = getattr(tp, "_gorg", getattr(tp, "__origin__", None))
+
+        while getattr(origin, "__args__", None):
+            origin = T_get_origin(origin)
+
         return typing_to_builtin_map.get(origin, origin)