Fixed UNION processing

Author: davidhozic

docs/source/changelog.rst

@@ -24,6 +24,12 @@ Glossary
 Releases
 ---------------------
 
+v1.2.2
+================
+- Fixed incorrect ``Union`` processing if it was used in a ``List`` annotation.
+
+
+
 v1.2.1
 ================
 - Replaced raw usage of ``.__annotations__`` with :func:`typing.get_typehints`.

tkclasswiz/__init__.py

@@ -3,7 +3,7 @@
 Works with Tkinter / TTKBootstrap.
 """
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 from .object_frame import *
 from .annotations import *

tkclasswiz/annotations.py

@@ -94,7 +94,7 @@ def get_annotations(class_) -> dict:
     in Python 3.12.
     """
     annotations = {}
-    with suppress(AttributeError):
+    with suppress(AttributeError, TypeError):
         if isclass(class_):
             annotations = get_type_hints(class_.__init__)
         elif isclass(origin_class := get_origin(class_)) and issubclass(origin_class, Generic):

tkclasswiz/object_frame/frame_base.py

@@ -175,16 +175,22 @@ def remove_classes(types: list):
                 if isabstract(type_):
                     r.remove(type_)
 
-            return r
+            return tuple(r)
 
-        while get_origin(types_in) is Union:
-            types_in = get_args(types_in)
+        if get_origin(types_in) is Union:
+            types_in = cls.convert_types(get_args(types_in))
 
-        if not isinstance(types_in, list):
-            if isinstance(types_in, tuple):
-                types_in = list(types_in)
-            else:
-                types_in = [types_in, ]
+        elif issubclass_noexcept(origin := get_origin(types_in), Iterable) and types_in is not str:
+            types_in = origin[cls.convert_types(get_args(types_in))]
+
+        if isinstance(types_in, tuple):
+            new_types = []
+            for t in types_in:
+                new_types.extend(cls.convert_types(t))
+
+            types_in = new_types
+        else:
+            types_in = (types_in,)
 
         # Also include inherited objects
         subtypes = []
@@ -197,7 +203,7 @@ def remove_classes(types: list):
                     subtypes.extend(cls.convert_types(st))
 
         # Remove wrapped classes (eg. wrapped by decorator) + ABC classes
-        return remove_classes(types_in + subtypes)
+        return remove_classes([*types_in, *subtypes])
 
     def init_main_frame(self):
         frame_main = ttk.Frame(self)

tkclasswiz/object_frame/frame_iterable.py

@@ -88,12 +88,7 @@ def __init__(
         ttk.Button(frame_up_down, text="Up", command=lambda: w.move_selection(-1)).pack(side="left", fill=tk.X, expand=True)
         ttk.Button(frame_up_down, text="Down", command=lambda: w.move_selection(1)).pack(side="left", fill=tk.X, expand=True)
 
-        args = get_args(self.class_)
-        args = self.convert_types(args)
-        if get_origin(args[0]) is Union:
-            args = get_args(args[0])
-
-        for arg in args:
+        for arg in get_args(self.class_):
             menu.add_command(label=self.get_cls_name(arg), command=partial(self.new_object_frame, arg, w))
 
         w.pack(side="left", fill=tk.BOTH, expand=True)