fixed up bug I just introduced

nipype · Jul 17, 2023 · e4041a7 · e4041a7
1 parent 7c254b6
commit e4041a7
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/pydra/utils/typing.py b/pydra/utils/typing.py
@@ -103,16 +103,15 @@ def expand_pattern(t):
             origin = get_origin(t)
             if origin is None:
                 return t
+            if origin not in (ty.Union, type):
+                if not any(issubclass(origin, t) for t in (ty.Mapping, ty.Sequence)):
+                    # Don't know what to do with type arguments so just return original type
+                    return t
             args = get_args(t)
             if not args or args == (Ellipsis,):  # Not sure Ellipsis by itself is valid
                 # If no args were provided, or those arguments were an ellipsis
                 assert isinstance(origin, type)
                 return origin
-            if origin not in (ty.Union, type) or any(
-                issubclass(origin, t) for t in (ty.Mapping, ty.Sequence)
-            ):
-                # Don't know what to do with type arguments so just return original type
-                return t
             return (origin, [expand_pattern(a) for a in args])
 
         self.tp = tp