diff --git a/pysollib/init.py b/pysollib/init.py index 0621c366f..162d47e1f 100644 --- a/pysollib/init.py +++ b/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: diff --git a/pysollib/pysolgtk/findcarddialog.py b/pysollib/pysolgtk/findcarddialog.py index 0b6f1fa48..ee491fbad 100644 --- a/pysollib/pysolgtk/findcarddialog.py +++ b/pysollib/pysolgtk/findcarddialog.py @@ -23,7 +23,7 @@ # imports # import os -# from six.moves import tkinter +# import tkinter # import traceback # # PySol imports diff --git a/pysollib/pysolgtk/fullpicturedialog.py b/pysollib/pysolgtk/fullpicturedialog.py index 4a26eab63..541d2dd6f 100644 --- a/pysollib/pysolgtk/fullpicturedialog.py +++ b/pysollib/pysolgtk/fullpicturedialog.py @@ -23,7 +23,7 @@ # imports # import os -# from six.moves import tkinter +# import tkinter # import traceback # # PySol imports diff --git a/pysollib/pysolgtk/gameinfodialog.py b/pysollib/pysolgtk/gameinfodialog.py index 8ceb39020..fdb910865 100644 --- a/pysollib/pysolgtk/gameinfodialog.py +++ b/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 diff --git a/pysollib/tile/fontsdialog.py b/pysollib/tile/fontsdialog.py index 858944dd9..39c939273 100644 --- a/pysollib/tile/fontsdialog.py +++ b/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 diff --git a/pysollib/tile/playeroptionsdialog.py b/pysollib/tile/playeroptionsdialog.py index 878020c1a..604b5aff3 100644 --- a/pysollib/tile/playeroptionsdialog.py +++ b/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 diff --git a/pysollib/tile/progressbar.py b/pysollib/tile/progressbar.py index 883a9263d..703bf2721 100644 --- a/pysollib/tile/progressbar.py +++ b/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 # ************************************************************************ diff --git a/pysollib/tile/selectcardset.py b/pysollib/tile/selectcardset.py index b5115cbc4..4b5ec0306 100644 --- a/pysollib/tile/selectcardset.py +++ b/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 diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index f979b7063..218ccbe75 100644 --- a/pysollib/tile/selectgame.py +++ b/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 diff --git a/pysollib/tile/selecttile.py b/pysollib/tile/selecttile.py index c7ad0bb45..56e779063 100644 --- a/pysollib/tile/selecttile.py +++ b/pysollib/tile/selecttile.py @@ -22,6 +22,7 @@ # ---------------------------------------------------------------------------## import os +import tkinter from pysollib.mfxutil import KwStruct, USE_PIL from pysollib.mygettext import _ @@ -29,7 +30,6 @@ 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 diff --git a/pysollib/tile/soundoptionsdialog.py b/pysollib/tile/soundoptionsdialog.py index 9977955c1..ed7390ebb 100644 --- a/pysollib/tile/soundoptionsdialog.py +++ b/pysollib/tile/soundoptionsdialog.py @@ -22,6 +22,7 @@ # --------------------------------------------------------------------------- import os +import tkinter from pysollib.mfxutil import KwStruct from pysollib.mygettext import _ @@ -29,7 +30,6 @@ 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 diff --git a/pysollib/tile/statusbar.py b/pysollib/tile/statusbar.py index 5cc03161f..c23632171 100644 --- a/pysollib/tile/statusbar.py +++ b/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 diff --git a/pysollib/tile/timeoutsdialog.py b/pysollib/tile/timeoutsdialog.py index 896d1f3d0..c4fafd5ab 100644 --- a/pysollib/tile/timeoutsdialog.py +++ b/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 diff --git a/pysollib/tile/tkhtml.py b/pysollib/tile/tkhtml.py index 4ede24f0c..0e2c357bc 100644 --- a/pysollib/tile/tkhtml.py +++ b/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 diff --git a/pysollib/tile/tkstats.py b/pysollib/tile/tkstats.py index 9d940497e..ac8c9d026 100644 --- a/pysollib/tile/tkstats.py +++ b/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 diff --git a/pysollib/tile/tktree.py b/pysollib/tile/tktree.py index ce0bfa089..34dc7611e 100644 --- a/pysollib/tile/tktree.py +++ b/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 diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py index c0af8d00e..1e990cac7 100644 --- a/pysollib/tile/tkwidget.py +++ b/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 diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py index 435f077de..12520d832 100644 --- a/pysollib/tile/toolbar.py +++ b/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 diff --git a/pysollib/tile/wizarddialog.py b/pysollib/tile/wizarddialog.py index 8c28e74fa..534f7b880 100644 --- a/pysollib/tile/wizarddialog.py +++ b/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 diff --git a/pysollib/tk/basetkmfxdialog.py b/pysollib/tk/basetkmfxdialog.py index bb9f0b7da..946c5ba95 100644 --- a/pysollib/tk/basetkmfxdialog.py +++ b/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): diff --git a/pysollib/tk/fontsdialog.py b/pysollib/tk/fontsdialog.py index 1bb434141..8347e6532 100644 --- a/pysollib/tk/fontsdialog.py +++ b/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 diff --git a/pysollib/tk/playeroptionsdialog.py b/pysollib/tk/playeroptionsdialog.py index ca48d80ec..767353814 100644 --- a/pysollib/tk/playeroptionsdialog.py +++ b/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 diff --git a/pysollib/tk/progressbar.py b/pysollib/tk/progressbar.py index 4a1a191b9..3be9f842e 100644 --- a/pysollib/tk/progressbar.py +++ b/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 # ************************************************************************ diff --git a/pysollib/tk/selectcardset.py b/pysollib/tk/selectcardset.py index f9b68974f..112c53b85 100644 --- a/pysollib/tk/selectcardset.py +++ b/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 diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index cb9207785..4a8b20020 100644 --- a/pysollib/tk/selectgame.py +++ b/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 diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py index b586df4e5..cb447213a 100644 --- a/pysollib/tk/selecttile.py +++ b/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 diff --git a/pysollib/tk/solverdialog.py b/pysollib/tk/solverdialog.py index 29f38069c..8fcd2e9ad 100644 --- a/pysollib/tk/solverdialog.py +++ b/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 - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index c9081d7be..031f1b41b 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -22,6 +22,7 @@ # ---------------------------------------------------------------------------## import os +import tkinter from pysollib.mfxutil import KwStruct from pysollib.mygettext import _ @@ -29,8 +30,6 @@ from pysollib.settings import TITLE from pysollib.ui.tktile.tkconst import EVENT_HANDLED -from six.moves import tkinter - from .tkwidget import MfxDialog, MfxMessageDialog # ************************************************************************ diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py index 89cef5fbd..f94d5d39a 100644 --- a/pysollib/tk/statusbar.py +++ b/pysollib/tk/statusbar.py @@ -23,12 +23,11 @@ import os import sys +import tkinter from pysollib.mygettext import _ from pysollib.settings import WIN_SYSTEM -from six.moves import tkinter - from .tkwidget import MfxTooltip if __name__ == '__main__': diff --git a/pysollib/tk/tabpage.py b/pysollib/tk/tabpage.py index 60c4bf9ea..0db5a37ad 100644 --- a/pysollib/tk/tabpage.py +++ b/pysollib/tk/tabpage.py @@ -24,7 +24,7 @@ a couple of classes for implementing partial tabbed-page like behaviour """ -from six.moves import tkinter +import tkinter MYRIDGE, MYRAISED = tkinter.RAISED, tkinter.RIDGE # MYRIDGE, MYRAISED = tkinter.RIDGE, tkinter.RAISED diff --git a/pysollib/tk/timeoutsdialog.py b/pysollib/tk/timeoutsdialog.py index 4c4c97449..e8e50fc81 100644 --- a/pysollib/tk/timeoutsdialog.py +++ b/pysollib/tk/timeoutsdialog.py @@ -21,12 +21,11 @@ # # --------------------------------------------------------------------------- +import tkinter from pysollib.mfxutil import KwStruct from pysollib.mygettext import _ -from six.moves import tkinter - from .tkwidget import MfxDialog diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 27eab4415..4d97a00a6 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -23,13 +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 .statusbar import HtmlStatusbar from .tkwidget import MfxMessageDialog diff --git a/pysollib/tk/tkstats.py b/pysollib/tk/tkstats.py index 6e6954b58..509a74300 100644 --- a/pysollib/tk/tkstats.py +++ b/pysollib/tk/tkstats.py @@ -23,6 +23,7 @@ import os import time +import tkinter from pysollib.mfxutil import KwStruct, kwdefault 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 .tkwidget import MfxDialog, MfxMessageDialog diff --git a/pysollib/tk/tktree.py b/pysollib/tk/tktree.py index 8996f8167..96e3179b6 100644 --- a/pysollib/tk/tktree.py +++ b/pysollib/tk/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 diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 228db91fa..dd63bb0ce 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -22,6 +22,7 @@ # --------------------------------------------------------------------------- import time +import tkinter import traceback from pysollib.mfxutil import KwStruct, destruct, kwdefault, openURL @@ -32,7 +33,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 # ************************************************************************ diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index 1ae348449..973503cbd 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -22,6 +22,7 @@ # ---------------------------------------------------------------------------## import os +import tkinter from pysollib.mfxutil import Image, ImageTk from pysollib.mygettext import _, n_ @@ -31,8 +32,6 @@ from pysollib.util import IMAGE_EXTENSIONS from pysollib.winsystems import TkSettings -from six.moves import tkinter - from .tkwidget import MfxTooltip diff --git a/pysollib/tk/wizarddialog.py b/pysollib/tk/wizarddialog.py index 891caeb3f..36fdaad1d 100644 --- a/pysollib/tk/wizarddialog.py +++ b/pysollib/tk/wizarddialog.py @@ -21,13 +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 .tabpage import TabPageSet from .tkwidget import MfxDialog diff --git a/pysollib/ui/tktile/Canvas2.py b/pysollib/ui/tktile/Canvas2.py index ba656755b..9c6cca96b 100644 --- a/pysollib/ui/tktile/Canvas2.py +++ b/pysollib/ui/tktile/Canvas2.py @@ -1,9 +1,9 @@ # This module exports classes for the various canvas item types # NOTE: This module was an experiment and is now obsolete. -# It's best to use the Tkinter.Canvas class directly. +# It's best to use the tkinter.Canvas class directly. -from six.moves.tkinter import Canvas, _cnfmerge, _flatten # noqa: F401 +from tkinter import Canvas, _cnfmerge, _flatten # noqa: F401 class CanvasItem: diff --git a/pysollib/ui/tktile/colorsdialog.py b/pysollib/ui/tktile/colorsdialog.py index 5e845d095..0a7ebf3c6 100644 --- a/pysollib/ui/tktile/colorsdialog.py +++ b/pysollib/ui/tktile/colorsdialog.py @@ -21,10 +21,11 @@ # # --------------------------------------------------------------------------- +import tkinter + from pysollib.mfxutil import KwStruct from pysollib.mygettext import _ -from six.moves import tkinter from six.moves.tkinter_colorchooser import askcolor diff --git a/pysollib/ui/tktile/edittextdialog.py b/pysollib/ui/tktile/edittextdialog.py index 860a42f45..a336aa33d 100644 --- a/pysollib/ui/tktile/edittextdialog.py +++ b/pysollib/ui/tktile/edittextdialog.py @@ -1,8 +1,8 @@ +import tkinter + from pysollib.mfxutil import KwStruct from pysollib.mygettext import _ -from six.moves import tkinter - class BaseEditTextDialog: def __init__(self, parent, title, text, **kw): diff --git a/pysollib/ui/tktile/findcarddialog.py b/pysollib/ui/tktile/findcarddialog.py index 51d81508b..9bbfcd817 100644 --- a/pysollib/ui/tktile/findcarddialog.py +++ b/pysollib/ui/tktile/findcarddialog.py @@ -22,6 +22,7 @@ # --------------------------------------------------------------------------- import os +import tkinter from pysollib.mygettext import _ from pysollib.resource import CSI @@ -31,8 +32,6 @@ from pysollib.ui.tktile.tkutil import after, after_cancel from pysollib.ui.tktile.tkutil import bind, makeImage, unbind_destroy -from six.moves import tkinter - LARGE_EMBLEMS_SIZE = (38, 34) SMALL_EMBLEMS_SIZE = (31, 21) diff --git a/pysollib/ui/tktile/fullpicturedialog.py b/pysollib/ui/tktile/fullpicturedialog.py index c413cbfa3..251a54c13 100644 --- a/pysollib/ui/tktile/fullpicturedialog.py +++ b/pysollib/ui/tktile/fullpicturedialog.py @@ -21,14 +21,14 @@ # # --------------------------------------------------------------------------- +import tkinter + from pysollib.mygettext import _ from pysollib.settings import TITLE from pysollib.ui.tktile.tkcanvas import MfxCanvas, MfxCanvasGroup from pysollib.ui.tktile.tkcanvas import MfxCanvasImage from pysollib.ui.tktile.tkutil import bind, unbind_destroy -from six.moves import tkinter - class FullPictureDialog(tkinter.Toplevel): CARD_IMAGES = {} # key: (type, rank, suit) diff --git a/pysollib/ui/tktile/menubar.py b/pysollib/ui/tktile/menubar.py index 36fed8573..d10f2a1cf 100644 --- a/pysollib/ui/tktile/menubar.py +++ b/pysollib/ui/tktile/menubar.py @@ -3,6 +3,7 @@ import platform import re import sys +import tkinter from pysollib.gamedb import GI from pysollib.hint import PySolHintLayoutImportError @@ -17,7 +18,6 @@ from pysollib.ui.tktile.tkconst import STATUSBAR_ITEMS, TOOLBAR_BUTTONS from pysollib.ui.tktile.tkutil import after_idle, bind -from six.moves import tkinter from six.moves import tkinter_tkfiledialog diff --git a/pysollib/ui/tktile/solverdialog.py b/pysollib/ui/tktile/solverdialog.py index 7d335665e..aa3afc0a0 100644 --- a/pysollib/ui/tktile/solverdialog.py +++ b/pysollib/ui/tktile/solverdialog.py @@ -1,9 +1,9 @@ +import tkinter + from pysollib.mygettext import _ from pysollib.settings import TITLE from pysollib.ui.tktile.tkconst import EVENT_HANDLED -from six.moves import tkinter - class BaseSolverDialog: def _ToggleShowProgressButton(self, *args): diff --git a/pysollib/ui/tktile/tkcanvas.py b/pysollib/ui/tktile/tkcanvas.py index ec99e8f76..0ddd1d7c4 100644 --- a/pysollib/ui/tktile/tkcanvas.py +++ b/pysollib/ui/tktile/tkcanvas.py @@ -21,13 +21,13 @@ # # --------------------------------------------------------------------------- +import tkinter + from pysollib.mfxutil import Image, ImageTk from pysollib.ui.tktile.Canvas2 import CanvasText, Group, Line, Rectangle from pysollib.ui.tktile.Canvas2 import ImageItem as ImageItem2 from pysollib.ui.tktile.tkutil import loadImage, unbind_destroy -from six.moves import tkinter - # ************************************************************************ # * canvas items diff --git a/pysollib/ui/tktile/tkconst.py b/pysollib/ui/tktile/tkconst.py index d9c9de559..e9af3faf8 100644 --- a/pysollib/ui/tktile/tkconst.py +++ b/pysollib/ui/tktile/tkconst.py @@ -21,9 +21,9 @@ # # ---------------------------------------------------------------------------## -from pysollib.mygettext import n_ +import tkinter -from six.moves import tkinter +from pysollib.mygettext import n_ # ************************************************************************ # * constants diff --git a/pysollib/ui/tktile/tkhtml.py b/pysollib/ui/tktile/tkhtml.py index ec24c9040..cfe58b5e9 100644 --- a/pysollib/ui/tktile/tkhtml.py +++ b/pysollib/ui/tktile/tkhtml.py @@ -23,6 +23,7 @@ import os import sys +import tkinter import pysollib.formatter import pysollib.htmllib2 as htmllib @@ -31,8 +32,6 @@ from pysollib.settings import TITLE from pysollib.ui.tktile.tkutil import bind, unbind_destroy -from six.moves import tkinter - REMOTE_PROTOCOLS = ("ftp:", "gopher:", "http:", "https:", "mailto:", "news:", "telnet:") diff --git a/pysollib/ui/tktile/tkutil.py b/pysollib/ui/tktile/tkutil.py index 14ba0321f..c93cdb432 100644 --- a/pysollib/ui/tktile/tkutil.py +++ b/pysollib/ui/tktile/tkutil.py @@ -23,12 +23,12 @@ import os import re +import tkinter from pysollib.mfxutil import Image, ImageDraw, ImageOps, ImageTk, \ get_default_resampling from pysollib.settings import TITLE, WIN_SYSTEM -from six.moves import tkinter from six.moves import tkinter_font diff --git a/pysollib/ui/tktile/tkwrap.py b/pysollib/ui/tktile/tkwrap.py index 3c438ea84..d85b1e2ec 100644 --- a/pysollib/ui/tktile/tkwrap.py +++ b/pysollib/ui/tktile/tkwrap.py @@ -21,9 +21,10 @@ # # --------------------------------------------------------------------------- +import tkinter + from pysollib.ui.tktile.tkconst import EVENT_PROPAGATE -from six.moves import tkinter TclError = tkinter.TclError diff --git a/scripts/cardset_viewer.py b/scripts/cardset_viewer.py index ae5fd5965..a669cfa59 100755 --- a/scripts/cardset_viewer.py +++ b/scripts/cardset_viewer.py @@ -8,11 +8,11 @@ # Arrow up/down flip through the sets import os +import tkinter from glob import glob from PIL import Image, ImageTk -from six.moves import tkinter from six.moves import tkinter_tkfiledialog as filedialog # messagebox