Extract a common base class.

pysollib/tile/basetilemfxdialog.py

@@ -0,0 +1,10 @@
+import ttk
+
+from tkwidget import MfxDialog
+
+class BaseTileMfxDialog(MfxDialog):
+    def _calcToolkit(self):
+        return ttk
+
+    def _calc_MfxDialog(self):
+        return MfxDialog

pysollib/tile/edittextdialog.py

@@ -28,20 +28,14 @@ import Tkinter
 import ttk
 
 # Toolkit imports
-from tkwidget import MfxDialog
+from pysollib.tile.basetilemfxdialog import BaseTileMfxDialog
 from pysollib.ui.tktile.edittextdialog import BaseEditTextDialog
 
 # ************************************************************************
 # *
 # ************************************************************************
 
-class EditTextDialog(BaseEditTextDialog, MfxDialog):
+class EditTextDialog(BaseEditTextDialog, BaseTileMfxDialog):
-
-    def _calcToolkit(self):
-        return ttk
-
-    def _calc_MfxDialog(self):
-        return MfxDialog
 
     def _calc_Resizable(self):
         return False

pysollib/tile/gameinfodialog.py

@@ -24,15 +24,8 @@
 
 __all__ = ['GameInfoDialog']
 
-# imports
-import ttk
-
 import pysollib.ui.tktile.gameinfodialog
-from tkwidget import MfxDialog
+from pysollib.tile.basetilemfxdialog import BaseTileMfxDialog
-class GameInfoDialog(MfxDialog, pysollib.ui.tktile.gameinfodialog.BaseGameInfoDialog):
 
-    def _calcToolkit(self):
+class GameInfoDialog(pysollib.ui.tktile.gameinfodialog.BaseGameInfoDialog, BaseTileMfxDialog):
-        return ttk
+    True
-
-    def _calc_MfxDialog(self):
-        return MfxDialog

pysollib/tile/solverdialog.py

@@ -37,7 +37,7 @@ from pysollib.mygettext import _, n_
 from pysollib.mfxutil import KwStruct
 
 # Toolkit imports
-from tkwidget import MfxDialog
+from pysollib.tile.basetilemfxdialog import BaseTileMfxDialog
 from tkwidget import PysolCombo
 from pysollib.ui.tktile.solverdialog import BaseSolverDialog, solver_dialog, connect_game_solver_dialog, destroy_solver_dialog, reset_solver_dialog
 
@@ -46,14 +46,7 @@ from pysollib.ui.tktile.solverdialog import BaseSolverDialog, solver_dialog, con
 # *
 # ************************************************************************
 
-class SolverDialog(BaseSolverDialog, MfxDialog):
+class SolverDialog(BaseSolverDialog, BaseTileMfxDialog):
-
-    def _calcToolkit(self):
-        return ttk
-
-    def _calc_MfxDialog(self):
-        return MfxDialog
-
     def _createGamesVar(self, frame, row):
         cb = PysolCombo(frame, values=tuple(self.gamenames),
                         selectcommand=self.gameSelected,
@@ -76,7 +69,7 @@ class SolverDialog(BaseSolverDialog, MfxDialog):
                       strings=strings,
                       default=0,
                       )
-        return MfxDialog.initKw(self, kw)
+        return self._calc_MfxDialog().initKw(self, kw)
 
     def connectGame(self, game):
         name = self.app.getGameTitleName(game.id)

scripts/gen_individual_importing_tests.py

@@ -133,6 +133,7 @@ for module_name in [
 'pysollib.settings',
 'pysollib.stack',
 'pysollib.stats',
+'pysollib.tile.basetilemfxdialog',
 'pysollib.tile.colorsdialog',
 'pysollib.tile.edittextdialog',
 'pysollib.tile.findcarddialog',