flake 8

pysollib/customgame.py

@@ -368,3 +368,7 @@ def registerCustomGame(gameclass):
     registerGame(GameInfo(gameid, gameclass, s['name'],
                           GI.GT_CUSTOM | GI.GT_ORIGINAL,
                           s['decks'], s['redeals'], s['skill_level']))
+
+
+def no_use():
+    pass

pysollib/wizardpresets.py

@@ -127,4 +127,3 @@ presets = {
         },
 
 }
-

pysollib/wizardutil.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- mode: python; coding: utf-8; -*-
-# ---------------------------------------------------------------------------##
+# ---------------------------------------------------------------------------
 #
 # Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
 # Copyright (C) 2003 Mt. Hood Playing Card Co.
@@ -19,28 +19,62 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# ---------------------------------------------------------------------------##
+# ---------------------------------------------------------------------------
 
+import sys
 import os
 
 from pysollib.gamedb import GI, loadGame
-from pysollib.util import *
+from pysollib.util import ACE, ANY_RANK, KING, NO_RANK, UNLIMITED_MOVES
-from pysollib.stack import *
+from pysollib.stack import AC_FoundationStack, \
+        AC_RowStack, \
+        BO_RowStack, \
+        DealReserveRedealTalonStack, \
+        DealRowRedealTalonStack, \
+        GroundsForADivorceTalonStack, \
+        InitialDealTalonStack, \
+        RK_FoundationStack, \
+        RK_RowStack, \
+        Spider_AC_Foundation, \
+        Spider_AC_RowStack, \
+        Spider_RK_Foundation, \
+        Spider_SS_Foundation, \
+        Spider_SS_RowStack, \
+        SpiderTalonStack, \
+        SC_FoundationStack, \
+        SC_RowStack, \
+        SS_FoundationStack, \
+        SS_RowStack, \
+        UD_AC_RowStack, \
+        UD_RK_RowStack, \
+        UD_SC_RowStack, \
+        UD_SS_RowStack, \
+        WasteTalonStack, \
+        Yukon_AC_RowStack, \
+        Yukon_RK_RowStack, \
+        Yukon_SS_RowStack
+
+
 from pysollib.layout import Layout
 from wizardpresets import presets
 
 from pysollib.mygettext import _, n_
 
+if sys.version_info > (3,):
+    basestring = str
+    unicode = str
+
 # ************************************************************************
 # *
 # ************************************************************************
 
+
 class WizSetting:
     def __init__(self, values_map, default, var_name,
                  label, widget='menu'):
         self.values_map = values_map
         self.default = default
-        ##self.values_dict = dict(self.values_map)
+        # self.values_dict = dict(self.values_map)
         self.translation_map = {}       # for backward translation
         if widget == 'menu':
             self.values = []
@@ -350,11 +384,10 @@ WizardWidgets = (
 
 def write_game(app, game=None):
     import pysollib.customgame                   # for py2exe
-
+    pysollib.customgame.no_use()
     if game is None:
         # new game
         d = app.dn.plugins
-        ls = os.listdir(d)
         n = 1
         while True:
             fn = os.path.join(d, 'customgame%d.py' % n)  # file name
@@ -371,7 +404,7 @@ def write_game(app, game=None):
         gameid = game.SETTINGS['gameid']
         check_game = False
 
-    ##print '===>', fn
+    # print '===>', fn
     fd = open(fn, 'w')
 
     fd.write('''\
@@ -420,6 +453,7 @@ registerCustomGame(MyCustomGame)
 
     return gameid
 
+
 def reset_wizard(game):
     for w in WizardWidgets:
         if isinstance(w, basestring):
@@ -434,5 +468,3 @@ def reset_wizard(game):
             else:
                 v = w.default
         w.current_value = v
-
-

tests/style/py-flake8.t

@@ -10,7 +10,7 @@ use String::ShellQuote qw/ shell_quote /;
 
 # my $cmd = shell_quote( 'flake8', '.' );
 my $cmd = shell_quote( 'flake8',
-    grep { not($_ eq './pysollib/pysoltk.py') } glob('./pysollib/[a-u]*.py') );
+    grep { not($_ eq './pysollib/pysoltk.py') } glob('./pysollib/[a-z]*.py') );
 
 # TEST
 eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." );