Fixed convert_objects_to_script

Fixed enum flags

Fixed tooltip

Fixed union

Author: davidhozic

docs/source/changelog.rst

@@ -19,11 +19,26 @@ Glossary
         The change could break functionality from previous versions but only if it
         was used in a certain way.
 
+    |UNRELEASED|
+      These changes have not been yet released.
 
 ---------------------
 Releases
 ---------------------
 
+v1.4.8
+=====================
+- Fixed :class:`tkclasswiz.convert.convert_objects_to_script` function:
+  
+  - not being able to convert global enums (or enum flags)
+  - duplicated import strings
+  
+- Fixed flags not definable as flags when editing list-like objects.
+- Fixed tooltip style not adjusting when using ttkbootstrap.
+  E. g., in dark mode only the text was updated, but background was still the same. 
+- Fixed the Python3.10+ Union type (``A | B``) not being detected as an union type.
+
+
 v1.4.7
 ===================
 - Fixed incorrect item being removed (at incorrect index) when editing an object.

tkclasswiz/__init__.py

@@ -27,7 +27,7 @@
 SOFTWARE.
 """
 
-__version__ = "1.4.7"
+__version__ = "1.4.8"
 
 
 from .object_frame import *

tkclasswiz/annotations.py

@@ -6,6 +6,7 @@
 from inspect import isclass, isabstract
 from itertools import product, chain
 from contextlib import suppress
+from types import UnionType
 
 from .utilities import issubclass_noexcept
 from .doc import doc_category
@@ -155,12 +156,13 @@ def remove_classes(types: list):
         input_type.__name__ = origin.__name__
 
     # Unpack Union items into a tuple
-    if origin is Union or issubclass_noexcept(origin, (Iterable, Generic)):
+    union_type = origin in {Union, UnionType}
+    if union_type or issubclass_noexcept(origin, (Iterable, Generic)):
         new_types = []
         for arg_group in get_args(input_type):
             new_types.append(remove_classes(list(convert_types(arg_group))))
 
-        if origin is Union:
+        if union_type:
             return tuple(chain.from_iterable(new_types))  # Just expand unions
 
         # Process abstract classes and polymorphism

tkclasswiz/convert.py

@@ -240,17 +240,11 @@ def convert_objects_to_script(object: Union[ObjectInfo, list, tuple, set, str]):
         object_str = f"{object.class_.__name__}(\n    "
         attr_str = []
         for attr, value in object.data.items():
-            if isinstance(value, (ObjectInfo, list, tuple, set, Enum)):
-                value, import_data_ = convert_objects_to_script(value)
-                import_data.extend(import_data_)
-
-            elif isinstance(value, str):
-                value, _ = convert_objects_to_script(value)
-
+            value, import_data_ = convert_objects_to_script(value)
+            import_data.extend(import_data_)
             attr_str.append(f"{attr}={value},\n")
 
         import_data.append(f"from {object.class_.__module__} import {object.class_.__name__}")
-
         object_str += "    ".join(''.join(attr_str).splitlines(True)) + ")"
         object_data.append(object_str)
 
@@ -265,8 +259,15 @@ def convert_objects_to_script(object: Union[ObjectInfo, list, tuple, set, str]):
         object_data.append(_list_data)
 
     elif isinstance(object, Enum):
-        import_data.append(f"from {object.__module__} import {type(object).__name__}")
-        object_data.append(str(object))
+        type_name = type(object).__name__
+        import_data.append(f"from {object.__module__} import {type_name}")
+        object_name = object._name_
+        if not object_name:
+            name = f"{type_name}({object._value_})"
+        else:
+            name = ' | '.join(map(lambda name: f"{type_name}.{name}", object_name.split('|')))
+
+        object_data.append(name)
 
     else:
         if isinstance(object, str):
@@ -275,7 +276,7 @@ def convert_objects_to_script(object: Union[ObjectInfo, list, tuple, set, str]):
         else:
             object_data.append(str(object))
 
-    return ",".join(object_data).strip(), import_data
+    return ",".join(object_data).strip(), sorted(set(import_data), key=lambda x: len(x), reverse=True)
 
 
 @extendable

tkclasswiz/object_frame/frame_iterable.py

@@ -1,7 +1,6 @@
 from typing import get_args, get_origin, Any, List, Literal
-from inspect import isclass, isfunction
 from functools import partial
-from enum import Enum
+from enum import Enum, Flag
 
 from ..doc import doc_category
 from ..deprecation import *
@@ -120,7 +119,7 @@ def _create_add_menu(self, args: list, menu: tk.Menu):
             if arg is None:
                 insert_items.append(...)
                 insert_items.append(None)
-            elif issubclass_noexcept(arg, Enum):
+            elif issubclass_noexcept(arg, Enum) and not issubclass_noexcept(arg, Flag):
                 insert_items.append(...)
                 insert_items.extend(list(arg))
             elif get_origin(arg) is Literal:

tkclasswiz/object_frame/frame_struct.py

@@ -1,6 +1,4 @@
 from typing import get_args, get_origin, Iterable, Union, Literal, Dict, Tuple
-
-from collections.abc import Iterable as ABCIterable
 from functools import partial
 from enum import Enum, Flag
 
@@ -252,7 +250,7 @@ def _fill_field_values(
         # The class of last list like type. Needed when "Edit selected" is used
         # since we don't know what type it was
         return any_filled
-    
+
     @extendable
     def load(self, old_data: ObjectInfo):
         data = old_data.data

tkclasswiz/object_frame/tooltip.py

@@ -1,12 +1,11 @@
 import tkinter.ttk as ttk
 import tkinter as tk
 
+from abc import ABCMeta, abstractmethod
 from typing import Optional
 
 from ..convert import ObjectInfo
 from ..storage import *
-from ..dpi import dpi_scaled
-from abc import ABCMeta, abstractmethod
 
 
 class BaseToolTip(tk.Toplevel):
@@ -24,12 +23,15 @@ def __init__(
         timeout_ms: int = 500,
     ):
         super().__init__(widget)
-        self.label = ttk.Label(self, background="white", wraplength=1000)
+        ttk.Style().configure(
+            style="tooltip.TLabel",  # ttkbootstrap compatibility
+            background="white",
+        )
+        self.label = ttk.Label(self, style="tooltip.TLabel", wraplength=1000)
         self.schedule_id = None
         self._widget = widget
         self.timeout_ms = timeout_ms
-        self.label.pack(padx=5, pady=5)
-        self.config(bg="white")
+        self.label.pack()
         self.pack_propagate(True)
         self._hide_tooltip()
         self.overrideredirect(True)