Import ttk from standard library, drop local copy

pysollib/games/pyramid.py

@@ -83,9 +83,9 @@ class Pyramid_StackMethods:
         if not self.game.demo:
             self.game.playSample("droppair", priority=200)
         if not (n == 1
-              and other_stack.cards
-              and self.acceptsCards(other_stack, [other_stack.cards[-1]])):
-           return
+                and other_stack.cards
+                and self.acceptsCards(other_stack, [other_stack.cards[-1]])):
+            return
         old_state = self.game.enterState(self.game.S_FILL)
         f = self.game.s.foundations[0]
         self.game.moveMove(n, self, f, frames=frames, shadow=shadow)

pysollib/tile/basetilemfxdialog.py

@@ -1,4 +1,5 @@
-from . import ttk
+from six.moves import tkinter_ttk as ttk
+
 from .tkwidget import MfxDialog
 
 

pysollib/tile/fontsdialog.py

@@ -27,8 +27,8 @@ 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
 
-from . import ttk
 from .tkwidget import MfxDialog
 from .tkwidget import PysolScale
 

pysollib/tile/menubar.py

@@ -29,7 +29,8 @@ from pysollib.ui.tktile.menubar import MfxMenu, PysolMenubarTkCommon
 from pysollib.ui.tktile.solverdialog import connect_game_solver_dialog
 from pysollib.util import CARDSET
 
-from . import ttk
+from six.moves import tkinter_ttk as ttk
+
 from .selectgame import SelectGameDialog, SelectGameDialogWithPreview
 from .selecttile import SelectTileDialogWithPreview
 from .soundoptionsdialog import SoundOptionsDialog

pysollib/tile/playeroptionsdialog.py

@@ -25,8 +25,8 @@ from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 
 from six.moves import tkinter
+from six.moves import tkinter_ttk as ttk
 
-from . import ttk
 from .tkwidget import MfxDialog
 
 

pysollib/tile/progressbar.py

@@ -25,8 +25,7 @@ from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from pysollib.ui.tktile.tkutil import makeToplevel, setTransient
 
 from six.moves import tkinter
-
-from . import ttk
+from six.moves import tkinter_ttk as ttk
 
 # ************************************************************************
 # * a simple progress bar

pysollib/tile/selectcardset.py

@@ -32,8 +32,8 @@ from pysollib.ui.tktile.tkutil import loadImage
 from pysollib.util import CARDSET
 
 from six.moves import tkinter
+from six.moves import tkinter_ttk as ttk
 
-from . import ttk
 from .selecttree import SelectDialogTreeCanvas
 from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
 from .tkwidget import MfxDialog, MfxScrolledCanvas, PysolScale

pysollib/tile/selectgame.py

@@ -32,8 +32,8 @@ from pysollib.ui.tktile.selecttree import SelectDialogTreeData
 from pysollib.ui.tktile.tkutil import unbind_destroy
 
 from six.moves import UserList
+from six.moves import tkinter_ttk as ttk
 
-from . import ttk
 from .selecttree import SelectDialogTreeCanvas
 from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
 from .tkwidget import MfxDialog, MfxScrolledCanvas

pysollib/tile/selecttile.py

@@ -28,8 +28,8 @@ from pysollib.ui.tktile.selecttree import SelectDialogTreeData
 import six
 from six.moves import tkinter
 from six.moves import tkinter_colorchooser
+from six.moves import tkinter_ttk as ttk
 
-from . import ttk
 from .selecttree import SelectDialogTreeCanvas
 from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
 from .tkwidget import MfxDialog, MfxScrolledCanvas

pysollib/tile/soundoptionsdialog.py

@@ -30,8 +30,8 @@ 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 . import ttk
 from .tkwidget import MfxDialog, MfxMessageDialog
 from .tkwidget import PysolScale
 

pysollib/tile/statusbar.py

@@ -29,8 +29,8 @@ from pysollib.mygettext import _
 
 import six
 from six.moves import tkinter
+from six.moves import tkinter_ttk as ttk
 
-from . import ttk
 from .tkwidget import MfxTooltip
 
 if __name__ == '__main__':

pysollib/tile/timeoutsdialog.py

@@ -25,8 +25,8 @@ from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 
 from six.moves import tkinter
+from six.moves import tkinter_ttk as ttk
 
-from . import ttk
 from .tkwidget import MfxDialog, PysolScale
 
 

pysollib/tile/tkhtml.py

@@ -29,8 +29,8 @@ 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 . import ttk
 from .statusbar import HtmlStatusbar
 from .tkwidget import MfxMessageDialog
 

pysollib/tile/tkstats.py

@@ -33,8 +33,8 @@ 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
 
-from . import ttk
 from .tkwidget import MfxDialog, MfxMessageDialog
 
 

pysollib/tile/tkwidget.py

@@ -38,8 +38,7 @@ import six
 from six import PY2
 from six.moves import tkinter
 from six.moves import tkinter_font
-
-from . import ttk
+from six.moves import tkinter_ttk as ttk
 
 # ************************************************************************
 # * abstract base class for the dialogs in this module

pysollib/tile/toolbar.py

@@ -33,8 +33,8 @@ 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 . import ttk
 from .tkwidget import MfxTooltip
 
 

pysollib/tile/wizarddialog.py

@@ -28,8 +28,8 @@ from pysollib.wizardutil import WizardWidgets
 
 import six
 from six.moves import tkinter
+from six.moves import tkinter_ttk as ttk
 
-from . import ttk
 from .tkwidget import MfxDialog
 from .tkwidget import PysolCombo, PysolScale
 

pysollib/winsystems/common.py

@@ -33,7 +33,7 @@ from pysollib.settings import VERSION
 
 if TOOLKIT == 'tk':
     if USE_TILE:
-        from pysollib.tile import ttk
+        from six.moves import tkinter_ttk as ttk
 
 
 def init_tile(app, top):

pysollib/winsystems/win32.py

@@ -25,7 +25,7 @@ from pysollib.settings import TOOLKIT, USE_TILE
 from pysollib.winsystems.common import BaseTkSettings, base_init_root_window
 
 if USE_TILE:
-    from pysollib.tile import ttk
+    from six.moves import tkinter_ttk as ttk
 
 
 def init_root_window(root, app):

pysollib/winsystems/x11.py

@@ -33,7 +33,7 @@ from pysollib.winsystems.common import \
 
 if TOOLKIT == 'tk':
     if USE_TILE:
-        from pysollib.tile import ttk
+        from six.moves import tkinter_ttk as ttk
 
 
 # ************************************************************************