From e3e3f750688811ffaddaeedc7dad1649c08fd7a0 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Tue, 18 Apr 2017 20:07:19 +0300
Subject: [PATCH] flake8

---
 pysollib/tk/wizarddialog.py | 18 ++++++++++--------
 tests/style/py-flake8.t     |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pysollib/tk/wizarddialog.py b/pysollib/tk/wizarddialog.py
index 8d9a7718..ef5b76e3 100644
--- a/pysollib/tk/wizarddialog.py
+++ b/pysollib/tk/wizarddialog.py
@@ -25,11 +25,12 @@ __all__ = ['WizardDialog']
 
 
 # imports
+import sys
 import Tkinter
 from tabpage import TabPageSet
 
 # PySol imports
-from pysollib.mygettext import _, n_
+from pysollib.mygettext import _
 from pysollib.mfxutil import KwStruct
 from pysollib.wizardutil import WizardWidgets
 from pysollib.wizardpresets import presets
@@ -38,6 +39,10 @@ from pysollib.wizardpresets import presets
 from tkwidget import MfxDialog
 
 
+if sys.version_info > (3,):
+    basestring = str
+
+
 # ************************************************************************
 # *
 # ************************************************************************
@@ -58,7 +63,7 @@ class WizardDialog(MfxDialog):
 
         for w in WizardWidgets:
             if isinstance(w, basestring):
-                p = notebook.AddPage(w)
+                notebook.AddPage(w)
                 frame = Tkinter.Frame(notebook.pages[w]['page'])
                 frame.pack(expand=True, fill='both', padx=2, pady=4)
                 frame.columnconfigure(1, weight=1)
@@ -75,7 +80,9 @@ class WizardDialog(MfxDialog):
                 values.remove(default)
                 values.sort()
                 values.insert(0, default)
-                callback = lambda v, w=w: self.presetSelected(v, w)
+
+                def callback(v, w=w):
+                    return self.presetSelected(v, w)
                 om = Tkinter.OptionMenu(frame, w.variable,
                                         command=callback, *values)
                 om.grid(row=row, column=1, sticky='ew', padx=2)
@@ -120,7 +127,6 @@ class WizardDialog(MfxDialog):
         focus = self.createButtons(bottom_frame, kw)
         self.mainloop(focus, kw.timeout)
 
-
     def presetSelected(self, v, w):
         n = w.translation_map[v]
         p = presets[n]
@@ -135,7 +141,6 @@ class WizardDialog(MfxDialog):
                 v = _(v)
             w.variable.set(v)
 
-
     def initKw(self, kw):
         kw = KwStruct(kw,
                       strings=(_('&OK'), _('&Cancel')),
@@ -143,6 +148,3 @@ class WizardDialog(MfxDialog):
                       separator=False,
                       )
         return MfxDialog.initKw(self, kw)
-
-
-
diff --git a/tests/style/py-flake8.t b/tests/style/py-flake8.t
index 13ecdf85..9afddada 100644
--- a/tests/style/py-flake8.t
+++ b/tests/style/py-flake8.t
@@ -27,7 +27,7 @@ my %skip =
 
 # my $cmd = shell_quote( 'flake8', '.' );
 my $cmd = shell_quote( 'flake8',
-    grep { not exists $skip{$_} } glob('./*.py ./scripts/*.py ./tests/board_gen/*.py ./pysollib/*.py ./pysollib/[cmgpuw]*/{*/*.py,*.py} ./pysollib/tile/*.py ./pysollib/tk/{[a-s]}*.py ./pysollib/ui/tktile/*.py') );
+    grep { not exists $skip{$_} } glob('./*.py ./scripts/*.py ./tests/board_gen/*.py ./pysollib/*.py ./pysollib/[cmgpuw]*/{*/*.py,*.py} ./pysollib/tile/*.py ./pysollib/tk/{[a-sw]}*.py ./pysollib/ui/tktile/*.py') );
 
 # TEST
 eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." );