304 ABC fjernet fra ModuleBase og metaklasse fjernet fra moduler

soitool/modules/code_table_base.py

@@ -29,11 +29,7 @@ AUTHENTICATIONBOARD_MODULE = "AuthenticationBoardModule"
 SUBTRACTORCODES_MODULE = "SubtractorcodesModule"
 
 
-class Meta(type(ModuleBase), type(QTableWidget)):
-    """Used as a metaclass to enable multiple inheritance."""
-
-
-class CodeTableBase(ModuleBase, QTableWidget, metaclass=Meta):
+class CodeTableBase(ModuleBase, QTableWidget):
     """Parent-class for AuthenticationBoardModule and SubtractorcodesModule.
 
     Inherits from ModuleBase and QTableWidget.

soitool/modules/module_base.py

 """Base/interface of each module."""
-from abc import ABC
 from PySide2 import QtGui
 from PySide2.QtCore import Qt
 
@@ -33,7 +32,7 @@ SUB_HEADLINE_FONT = qfont_with_pixel_size("Times New Roman", 26, 100)
 DEFAULT_FONT = qfont_with_pixel_size("Times New Roman", 23)
 
 
-class ModuleBase(ABC):
+class ModuleBase:
     """Interface for SOI-modules."""
 
     type = None

soitool/modules/module_code_phrase.py

@@ -36,11 +36,7 @@ class NoMoreAvailableCategories(Exception):
     """There are no more available categories."""
 
 
-class Meta(type(ModuleBase), type(QWidget)):
-    """Used as a metaclass to enable multiple inheritance."""
-
-
-class CodePhraseModule(ModuleBase, QWidget, metaclass=Meta):
+class CodePhraseModule(ModuleBase, QWidget):
     """Module for coded phrases.
 
     Codes are words fetched from the database in a certain category. All

soitool/modules/module_freetext.py

@@ -17,11 +17,7 @@ from soitool.modules.module_base import (
 )
 
 
-class Meta(type(ModuleBase), type(QWidget)):
-    """Used as a metaclass to enable multiple inheritance."""
-
-
-class FreeTextModule(ModuleBase, QWidget, metaclass=Meta):
+class FreeTextModule(ModuleBase, QWidget):
     """Module for arbitrary text.
 
     ## Note about widget size

soitool/modules/module_frequency_table.py

@@ -176,11 +176,7 @@ def toggle_all_in(checkboxes):
         checkboxes.itemAt(item_index).widget().setChecked(toggle)
 
 
-class Meta(type(ModuleBase), type(QWidget)):
-    """Used as a metaclass to enable multiple inheritance."""
-
-
-class FrequencyTableModule(ModuleBase, QWidget, metaclass=Meta):
+class FrequencyTableModule(ModuleBase, QWidget):
     """Table with overview of radio communication attributes.
 
     A frequency table is an overview of information needed to establish radio

soitool/modules/module_phonebook.py

@@ -86,11 +86,11 @@ class ColumnsChoicePopup(QDialog):
         return self.selected_columns
 
 
-class Meta(type(ModuleBase), type(QWidget)):
-    """Used as a metaclass to enable multiple inheritance."""
+# class Meta(type(ModuleBase), type(QWidget)):
+#    """Used as a metaclass to enable multiple inheritance."""
 
 
-class PhonebookModule(ModuleBase, QWidget, metaclass=Meta):
+class PhonebookModule(ModuleBase, QWidget):
     """SOI module for functions and associated contact informations.
 
     # This module includes:

soitool/modules/module_predefined_codes.py

@@ -34,11 +34,7 @@ MAXIMUM_COLUMN_HEIGHT = 1350
 DEFAULT_COLUMN_HEIGHT = 200
 
 
-class Meta(type(ModuleBase), type(QWidget)):
-    """Used as a metaclass to enable multiple inheritance."""
-
-
-class PredefinedCodesModule(ModuleBase, QWidget, metaclass=Meta):
+class PredefinedCodesModule(ModuleBase, QWidget):
     """QWidget representing SOI-module 'Forhåndsavtalte koder'.
 
     This widget has a headline, a warning-word and a layout with x amount of

soitool/modules/module_table.py

@@ -16,11 +16,7 @@ START_ROWS = 2
 START_COLUMNS = 2
 
 
-class Meta(type(ModuleBase), type(QTableWidget)):
-    """Used as a metaclass to enable multiple inheritance."""
-
-
-class TableModule(ModuleBase, QTableWidget, metaclass=Meta):
+class TableModule(ModuleBase, QTableWidget):
     """Modified QTableWidget.
 
     By default, the widget initializes as an empty START_ROWS * START_COLUMNS

test/test_soi.py

@@ -24,11 +24,11 @@ else:
     app = QtGui.qApp
 
 
-class Meta(type(ModuleBase), type(QWidget)):
-    """Used as a metaclass to enable multiple inheritance."""
+# class Meta(type(ModuleBase), type(QWidget)):
+#    """Used as a metaclass to enable multiple inheritance."""
 
 
-class TestModule(ModuleBase, QWidget, metaclass=Meta):
+class TestModule(ModuleBase, QWidget):
     """A simple module of given width, height and color for testing."""
 
     def __init__(self, color, width, height, *args, **kwargs):