Bug fixes

Author: davidhozic

docs/source/changelog.rst

@@ -24,14 +24,20 @@ Glossary
 Releases
 ---------------------
 
+
+v1.1.1
+================
+- Fixed template export on view-only mode, where the template exported wrong type.
+- Fixed abstract classes, defined with ``__metaclass__ = ABCMeta``, not being treated as abstract.  
+
+
 v1.1.0
 ================
 - :ref:`Abstract classes` (those that directly inherit :class:`abc.ABC`) are no longer
   definable through TkClassWizard.
 - :ref:`Polymorphism` support
 
 
-
 v1.0.1
 =================
 - Fixed a bug where the window didn't close and couldn't be closed

tkclasswiz/__init__.py

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

tkclasswiz/extensions.py

@@ -1,6 +1,6 @@
 """
 Module used to add extensions to add extensions
-to TOD.
+to TkClassWizard.
 """
 from typing import Callable, TypeVar, Union
 from inspect import isclass

tkclasswiz/object_frame/frame_base.py

@@ -1,5 +1,6 @@
 from typing import get_args, get_origin, Iterable, Union, Literal, Any, TYPE_CHECKING, TypeVar
 from abc import ABC
+from inspect import isabstract
 from contextlib import suppress
 
 from ..convert import *
@@ -157,10 +158,7 @@ def remove_classes(types: list):
                         r.remove(type_.__wrapped__)
 
                 # Abstract classes are classes that don't allow instantiation -> remove the class
-                # Use the __bases__ instead of issubclass, because ABC is only supposed to denote
-                # classes abstract if they directly inherit it. In the case of multi-level inheritance
-                # issubclass would still return True, even though type_ is not a direct subclass ABC.
-                if ABC in type_.__bases__:
+                if isabstract(type_):
                     r.remove(type_)
 
             return r

tkclasswiz/object_frame/frame_struct.py

@@ -72,12 +72,13 @@ def __init__(
         check_parameters: bool = True,
         allow_save = True,
         additional_values: dict = {},
+        _annotations_override: dict = None,
     ):
         super().__init__(class_, return_widget, parent, old_data, check_parameters,allow_save)
         self._map: Dict[str, Tuple[ComboBoxObjects, Iterable[type]]] = {}
         dpi_5 = dpi_scaled(5)
 
-        if not (annotations := get_annotations(class_)):
+        if not (annotations := _annotations_override or get_annotations(class_)):
             raise TypeError("This object cannot be edited.")
 
         # Template
@@ -297,15 +298,9 @@ class NewObjectFrameStructView(NewObjectFrameStruct):
     get mapped as annotations, which the :class:`NewObjectFrameStruct` knows how to handle.
     """
     def __init__(self, class_, *args, **kwargs):
-        class Viewer:
-            def __init__(self) -> None:
-                pass
-
-        Viewer.__name__ = class_.__name__
-
         old_data: ObjectInfo = kwargs["old_data"]
-        Viewer.__init__.__annotations__ = {k: v.class_ if isinstance(v, ObjectInfo) else type(v) for k, v in old_data.data.items()}
-        super().__init__(Viewer, *args, **kwargs)
+        annotations = {k: v.class_ if isinstance(v, ObjectInfo) else type(v) for k, v in old_data.data.items()}
+        super().__init__(class_, *args, **kwargs, _annotations_override=annotations)
 
     @gui_except()
     def _edit_selected(self, key: str, combo: ComboBoxObjects):
@@ -322,5 +317,3 @@ def _edit_selected(self, key: str, combo: ComboBoxObjects):
             return self.new_object_frame(selection.class_, combo, old_data=selection)
         else:
             return self.new_object_frame(type(selection), combo, old_data=selection)
-
-