finish removing dependency on six (#403)

* finish removing dependency on six

* fix tkinter.FileDialog

* fix filedialog <> FileDialog

Author: a-detiste

README.md

@@ -118,19 +118,18 @@ per the instructions above.
 At the moment, this only works on POSIX (Linux, FreeBSD and similar) systems.
 Windows and Mac users - you'll need to chip in with a script for your system.
 
-#### 1 - Install build prerequisites: six and pysol-cards
+#### 1 - Install build prerequisite: pysol-cards
 
 This is kind of stupid and maybe it can be fixed in the future, but for now:
 
 ```
-pip install six
 pip install pysol-cards
 ```
 
 You may want to use your OS distribution package system instead, for example:
 
 ```
-sudo apt-get install python3-six
+sudo apt-get install python3-pysol-cards
 ```
 
 For Pillow compilation, libjpeg headers and libraries need to be available:

pysollib/htmllib2.py

@@ -3,11 +3,10 @@
 See the HTML 2.0 specification:
 http://www.w3.org/hypertext/WWW/MarkUp/html-spec/html-spec_toc.html
 """
+import html.parser as html_parser
 
 from pysollib.formatter import AS_IS
 
-from six.moves import html_parser
-
 
 class HTMLParseError(RuntimeError):
     """Error raised when an HTML document can't be parsed."""

pysollib/kivy/menubar.py

@@ -2092,7 +2092,7 @@ def mOpen(self, *event):
             idir, ifile = "", ""
         if not idir:
             idir = self.app.dn.savegames
-#        d = tkFileDialog.Open()
+#        d = tkinter.filedialog.Open()
 #        filename = d.show(filetypes=self.FILETYPES,
 #                          defaultextension=self.DEFAULTEXTENSION,
 #                          initialdir=idir, initialfile=ifile)

pysollib/tile/basetilemfxdialog.py

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

pysollib/tile/fontsdialog.py

@@ -22,14 +22,13 @@
 # ---------------------------------------------------------------------------
 
 import tkinter
+import tkinter.font
+import tkinter.ttk as ttk
 
 from pysollib.mfxutil import KwStruct
 from pysollib.mygettext import _
 from pysollib.ui.tktile.tkutil import bind
 
-from six.moves import tkinter_font
-from six.moves import tkinter_ttk as ttk
-
 from .tkwidget import MfxDialog
 from .tkwidget import PysolScale
 
@@ -109,7 +108,7 @@ def __init__(self, parent, title, init_font, **kw):
                         command=self.fontupdate, variable=self.size_var)
         sc.grid(row=4, column=0, columnspan=2, sticky='news')
         #
-        font_families = list(tkinter_font.families())
+        font_families = list(tkinter.font.families())
         font_families.sort()
         selected = -1
         n = 0

pysollib/tile/menubar.py

@@ -21,6 +21,8 @@
 #
 # ---------------------------------------------------------------------------##
 
+import tkinter.ttk as ttk
+
 from pysollib.mygettext import _, n_
 from pysollib.settings import TITLE
 from pysollib.ui.tktile.findcarddialog import connect_game_find_card_dialog
@@ -32,8 +34,6 @@
 from pysollib.ui.tktile.solverdialog import connect_game_solver_dialog
 from pysollib.util import CARDSET
 
-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

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

pysollib/tile/progressbar.py

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

pysollib/tile/selectcardset.py

@@ -23,6 +23,7 @@
 
 import os
 import tkinter
+import tkinter.ttk as ttk
 
 from pysollib.mfxutil import KwStruct, USE_PIL
 from pysollib.mygettext import _
@@ -32,8 +33,6 @@
 from pysollib.ui.tktile.tkutil import bind, loadImage
 from pysollib.util import CARDSET
 
-from six.moves import tkinter_ttk as ttk
-
 from .selecttree import SelectDialogTreeCanvas
 from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
 from .tkwidget import MfxDialog, MfxScrolledCanvas, PysolCombo, PysolScale

pysollib/tile/selectgame.py

@@ -23,6 +23,7 @@
 
 import os
 import tkinter
+import tkinter.ttk as ttk
 from collections import UserList
 
 from pysollib.gamedb import GI
@@ -33,8 +34,6 @@
 from pysollib.ui.tktile.selecttree import SelectDialogTreeData
 from pysollib.ui.tktile.tkutil import bind, unbind_destroy
 
-from six.moves import tkinter_ttk as ttk
-
 from .selecttree import SelectDialogTreeCanvas
 from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
 from .tkwidget import MfxDialog, MfxScrolledCanvas, PysolCombo