import tkinter directly (#383)

* import tkinter directly

* linter

* linter

pysollib/init.py

@@ -102,7 +102,7 @@ def init():
         sys.argv.remove('--kivy')
 
     if pysollib.settings.TOOLKIT == 'tk':
-        from six.moves import tkinter
+        import tkinter
         root = tkinter.Tk(className=pysollib.settings.TITLE)
         root.withdraw()
         if tkinter.TkVersion < 8.4:

pysollib/pysolgtk/findcarddialog.py

@@ -23,7 +23,7 @@
 
 # imports
 #  import os
-#  from six.moves import tkinter
+#  import tkinter
 #  import traceback
 
 #  # PySol imports

pysollib/pysolgtk/fullpicturedialog.py

@@ -23,7 +23,7 @@
 
 # imports
 #  import os
-#  from six.moves import tkinter
+#  import tkinter
 #  import traceback
 
 #  # PySol imports

pysollib/pysolgtk/gameinfodialog.py

@@ -24,7 +24,7 @@
 
 #  # imports
 #  import os, sys
-#  from six.moves import tkinter
+#  import tkinter
 
 #  # PySol imports
 #  from pysollib.mfxutil import KwStruct

pysollib/tile/fontsdialog.py

@@ -21,11 +21,12 @@
 #
 # ---------------------------------------------------------------------------
 
+import tkinter
+
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 from pysollib.ui.tktile.tkutil import bind
 
-from six.moves import tkinter
 from six.moves import tkinter_font
 from six.moves import tkinter_ttk as ttk
 

pysollib/tile/playeroptionsdialog.py

@@ -21,10 +21,11 @@
 #
 # ---------------------------------------------------------------------------##
 
+import tkinter
+
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 from .tkwidget import MfxDialog

pysollib/tile/progressbar.py

@@ -21,10 +21,11 @@
 #
 # ---------------------------------------------------------------------------
 
+import tkinter
+
 from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from pysollib.ui.tktile.tkutil import makeToplevel, setTransient
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 # ************************************************************************

pysollib/tile/selectcardset.py

@@ -22,6 +22,7 @@
 # ---------------------------------------------------------------------------##
 
 import os
+import tkinter
 
 from pysollib.mfxutil import KwStruct, USE_PIL
 from pysollib.mygettext import _
@@ -31,7 +32,6 @@
 from pysollib.ui.tktile.tkutil import bind, loadImage
 from pysollib.util import CARDSET
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 from .selecttree import SelectDialogTreeCanvas

pysollib/tile/selectgame.py

@@ -22,6 +22,7 @@
 # ---------------------------------------------------------------------------
 
 import os
+import tkinter
 from collections import UserList
 
 from pysollib.gamedb import GI
@@ -32,7 +33,6 @@
 from pysollib.ui.tktile.selecttree import SelectDialogTreeData
 from pysollib.ui.tktile.tkutil import bind, unbind_destroy
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 from .selecttree import SelectDialogTreeCanvas

pysollib/tile/selecttile.py

@@ -22,14 +22,14 @@
 # ---------------------------------------------------------------------------##
 
 import os
+import tkinter
 
 from pysollib.mfxutil import KwStruct, USE_PIL
 from pysollib.mygettext import _
 from pysollib.resource import TTI
 from pysollib.ui.tktile.selecttree import SelectDialogTreeData
 from pysollib.ui.tktile.tkutil import bind
 
-from six.moves import tkinter
 from six.moves import tkinter_colorchooser
 from six.moves import tkinter_ttk as ttk
 

pysollib/tile/soundoptionsdialog.py

@@ -22,14 +22,14 @@
 # ---------------------------------------------------------------------------
 
 import os
+import tkinter
 
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 from pysollib.pysolaudio import pysolsoundserver
 from pysollib.settings import TITLE
 from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 from .tkwidget import MfxDialog, MfxMessageDialog

pysollib/tile/statusbar.py

@@ -24,10 +24,10 @@
 # imports
 import os
 import sys
+import tkinter
 
 from pysollib.mygettext import _
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 from .tkwidget import MfxTooltip

pysollib/tile/timeoutsdialog.py

@@ -21,10 +21,11 @@
 #
 # ---------------------------------------------------------------------------##
 
+import tkinter
+
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 from .tkwidget import MfxDialog, PysolScale

pysollib/tile/tkhtml.py

@@ -23,12 +23,12 @@
 
 import os
 import sys
+import tkinter
 
 from pysollib.mfxutil import Struct
 from pysollib.mygettext import _
 from pysollib.ui.tktile.tkhtml import Base_HTMLViewer
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 from .statusbar import HtmlStatusbar

pysollib/tile/tkstats.py

@@ -23,6 +23,7 @@
 
 import os
 import time
+import tkinter
 
 from pysollib.mfxutil import KwStruct
 from pysollib.mfxutil import format_time
@@ -31,7 +32,6 @@
 from pysollib.stats import ProgressionFormatter, PysolStatsFormatter
 from pysollib.ui.tktile.tkutil import bind, loadImage
 
-from six.moves import tkinter
 from six.moves import tkinter_font
 from six.moves import tkinter_ttk as ttk
 

pysollib/tile/tktree.py

@@ -22,11 +22,10 @@
 # ---------------------------------------------------------------------------
 
 import os
+import tkinter
 
 from pysollib.ui.tktile.tkutil import bind
 
-from six.moves import tkinter
-
 from .tkwidget import MfxScrolledCanvas
 
 

pysollib/tile/tkwidget.py

@@ -24,6 +24,7 @@
 import locale
 import os
 import time
+import tkinter
 import traceback
 
 from pysollib.mfxutil import KwStruct, destruct, kwdefault, openURL
@@ -34,7 +35,6 @@
 from pysollib.ui.tktile.tkutil import bind, unbind_destroy
 from pysollib.ui.tktile.tkutil import makeToplevel, setTransient
 
-from six.moves import tkinter
 from six.moves import tkinter_font
 from six.moves import tkinter_ttk as ttk
 

pysollib/tile/toolbar.py

@@ -22,6 +22,7 @@
 # ---------------------------------------------------------------------------##
 
 import os
+import tkinter
 
 from pysollib.mfxutil import Image, ImageOps, ImageTk
 from pysollib.mygettext import _, n_
@@ -32,7 +33,6 @@
 from pysollib.util import IMAGE_EXTENSIONS
 from pysollib.winsystems import TkSettings
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 from .tkwidget import MfxTooltip

pysollib/tile/wizarddialog.py

@@ -21,12 +21,13 @@
 #
 # ---------------------------------------------------------------------------
 
+import tkinter
+
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 from pysollib.wizardpresets import presets
 from pysollib.wizardutil import WizardWidgets
 
-from six.moves import tkinter
 from six.moves import tkinter_ttk as ttk
 
 from .tkwidget import MfxDialog

pysollib/tk/basetkmfxdialog.py

@@ -1,6 +1,6 @@
-from pysollib.tk.tkwidget import MfxDialog
+import tkinter
 
-from six.moves import tkinter
+from pysollib.tk.tkwidget import MfxDialog
 
 
 class BaseTkMfxDialog(MfxDialog):

pysollib/tk/fontsdialog.py

@@ -21,12 +21,13 @@
 #
 # ---------------------------------------------------------------------------##
 
+import tkinter
+
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 from pysollib.tk.tkwidget import MfxDialog
 from pysollib.ui.tktile.tkutil import bind
 
-from six.moves import tkinter
 from six.moves import tkinter_font
 
 

pysollib/tk/playeroptionsdialog.py

@@ -21,12 +21,12 @@
 #
 # ---------------------------------------------------------------------------##
 
+import tkinter
+
 from pysollib.mfxutil import KwStruct, Struct
 from pysollib.mygettext import _
 from pysollib.ui.tktile.tkutil import bind
 
-from six.moves import tkinter
-
 from .tkwidget import MfxDialog
 
 

pysollib/tk/progressbar.py

@@ -21,11 +21,11 @@
 #
 # ---------------------------------------------------------------------------##
 
+import tkinter
+
 from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from pysollib.ui.tktile.tkutil import makeToplevel, setTransient
 
-from six.moves import tkinter
-
 # ************************************************************************
 # * a simple progress bar
 # ************************************************************************

pysollib/tk/selectcardset.py

@@ -22,6 +22,7 @@
 # ---------------------------------------------------------------------------##
 
 import os
+import tkinter
 
 from pysollib.mfxutil import KwStruct, USE_PIL
 from pysollib.mygettext import _
@@ -31,8 +32,6 @@
 from pysollib.ui.tktile.tkutil import loadImage
 from pysollib.util import CARDSET
 
-from six.moves import tkinter
-
 from .selecttree import SelectDialogTreeCanvas
 from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
 from .tkwidget import MfxDialog, MfxScrolledCanvas

pysollib/tk/selectgame.py

@@ -22,6 +22,7 @@
 # ---------------------------------------------------------------------------
 
 import os
+import tkinter
 from collections import UserList
 
 from pysollib.gamedb import GI
@@ -32,8 +33,6 @@
 from pysollib.ui.tktile.selecttree import SelectDialogTreeData
 from pysollib.ui.tktile.tkutil import unbind_destroy
 
-from six.moves import tkinter
-
 from .selecttree import SelectDialogTreeCanvas
 from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
 from .tkwidget import MfxDialog, MfxScrolledCanvas

pysollib/tk/selecttile.py

@@ -21,12 +21,13 @@
 #
 # ---------------------------------------------------------------------------##
 
+import tkinter
 
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 from pysollib.ui.tktile.selecttree import SelectDialogTreeData
 
-from six.moves import tkinter, tkinter_colorchooser
+from six.moves import tkinter_colorchooser
 
 from .selecttree import SelectDialogTreeCanvas
 from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode

pysollib/tk/solverdialog.py

@@ -21,13 +21,13 @@
 #
 # ---------------------------------------------------------------------------##
 
+import tkinter
+
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 from pysollib.tk.basetkmfxdialog import BaseTkMfxDialog
 from pysollib.ui.tktile.solverdialog import BaseSolverDialog, solver_dialog
 
-from six.moves import range, tkinter
-
 # ************************************************************************
 # *
 # ************************************************************************

pysollib/tk/soundoptionsdialog.py

@@ -22,15 +22,14 @@
 # ---------------------------------------------------------------------------##
 
 import os
+import tkinter
 
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 from pysollib.pysolaudio import pysolsoundserver
 from pysollib.settings import TITLE
 from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 
-from six.moves import tkinter
-
 from .tkwidget import MfxDialog, MfxMessageDialog
 
 # ************************************************************************