anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

flake 8

Browse source
This commit is contained in:
Shlomi Fish 2017-04-17 04:32:58 +03:00
parent dc867906cf
commit 73895c6bf3
4 changed files with 232 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pysollib/customgame.py
View file

@ -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

1
pysollib/wizardpresets.py
View file

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

422
pysollib/wizardutil.py
View file

@ -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.stack import *
from pysollib.util import ACE, ANY_RANK, KING, NO_RANK, UNLIMITED_MOVES
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 = []
@ -64,249 +98,249 @@ class WizSetting:
WizardPresets = WizSetting(
values_map = presets.keys(),
default = 'None',
widget = 'preset',
label = _('Initial setting:'),
var_name = 'preset',
values_map=presets.keys(),
default='None',
widget='preset',
label=_('Initial setting:'),
var_name='preset',
)
GameName = WizSetting(
values_map = (),
default = _('My Game'),
widget = 'entry',
label = _('Name:'),
var_name = 'name',
values_map=(),
default=_('My Game'),
widget='entry',
label=_('Name:'),
var_name='name',
)
SkillLevel = WizSetting(
values_map = ((n_('Luck only'), GI.SL_LUCK),
(n_('Mostly luck'), GI.SL_MOSTLY_LUCK),
(n_('Balanced'), GI.SL_BALANCED),
(n_('Mostly skill'), GI.SL_MOSTLY_SKILL),
(n_('Skill only'), GI.SL_SKILL),
),
default = n_('Balanced'),
label = _('Skill level:'),
var_name = 'skill_level',
values_map=((n_('Luck only'), GI.SL_LUCK),
(n_('Mostly luck'), GI.SL_MOSTLY_LUCK),
(n_('Balanced'), GI.SL_BALANCED),
(n_('Mostly skill'), GI.SL_MOSTLY_SKILL),
(n_('Skill only'), GI.SL_SKILL),
),
default=n_('Balanced'),
label=_('Skill level:'),
var_name='skill_level',
)
NumDecks = WizSetting(
values_map = ((n_('One'), 1),
(n_('Two'), 2),
(n_('Three'), 3),
(n_('Four'), 4)),
default = n_('One'),
label = _('Number of decks:'),
var_name = 'decks',
values_map=((n_('One'), 1),
(n_('Two'), 2),
(n_('Three'), 3),
(n_('Four'), 4)),
default=n_('One'),
label=_('Number of decks:'),
var_name='decks',
)
LayoutType = WizSetting(
values_map = ((n_('FreeCell'), Layout.freeCellLayout),
(n_('Klondike'), Layout.klondikeLayout),
(n_('Gypsy'), Layout.gypsyLayout),
(n_('Harp'), Layout.harpLayout),
),
default = n_('FreeCell'),
label = _('Layout:'),
var_name = 'layout',
values_map=((n_('FreeCell'), Layout.freeCellLayout),
(n_('Klondike'), Layout.klondikeLayout),
(n_('Gypsy'), Layout.gypsyLayout),
(n_('Harp'), Layout.harpLayout),
),
default=n_('FreeCell'),
label=_('Layout:'),
var_name='layout',
)
TalonType = WizSetting(
values_map = ((n_('Deal all cards at the beginning'), InitialDealTalonStack),
(n_('Deal to waste'), WasteTalonStack),
(n_('Deal to tableau'), DealRowRedealTalonStack),
(n_('Deal to reserves'), DealReserveRedealTalonStack),
(n_('Spider'), SpiderTalonStack),
(n_('Grounds for a Divorce'), GroundsForADivorceTalonStack),
),
default = n_('Deal all cards at the beginning'),
label = _('Type:'),
var_name = 'talon',
values_map=((n_('Deal all cards at the beginning'), InitialDealTalonStack),
(n_('Deal to waste'), WasteTalonStack),
(n_('Deal to tableau'), DealRowRedealTalonStack),
(n_('Deal to reserves'), DealReserveRedealTalonStack),
(n_('Spider'), SpiderTalonStack),
(n_('Grounds for a Divorce'), GroundsForADivorceTalonStack),
),
default=n_('Deal all cards at the beginning'),
label=_('Type:'),
var_name='talon',
)
Redeals = WizSetting(
values_map = ((n_('No redeals'), 0),
(n_('One redeal'), 1),
(n_('Two redeals'), 2),
(n_('Three redeals'), 3),
(n_('Unlimited redeals'), -1),
),
default = n_('No redeals'),
label = _('Number of redeals:'),
var_name = 'redeals',
values_map=((n_('No redeals'), 0),
(n_('One redeal'), 1),
(n_('Two redeals'), 2),
(n_('Three redeals'), 3),
(n_('Unlimited redeals'), -1),
),
default=n_('No redeals'),
label=_('Number of redeals:'),
var_name='redeals',
)
DealToWaste = WizSetting(
values_map = (1, 5),
default = 1,
widget = 'spin',
label = _('# of cards dealt to the waste:'),
var_name = 'deal_to_waste',
values_map=(1, 5),
default=1,
widget='spin',
label=_('# of cards dealt to the waste:'),
var_name='deal_to_waste',
)
TalonShuffle = WizSetting(
values_map = (0, 1),
default = 0,
label = _('Shuffle during redeal:'),
var_name = 'talon_shuffle',
widget = 'check',
values_map=(0, 1),
default=0,
label=_('Shuffle during redeal:'),
var_name='talon_shuffle',
widget='check',
)
FoundType = WizSetting(
values_map = ((n_('Same suit'), SS_FoundationStack),
(n_('Alternate color'), AC_FoundationStack),
(n_('Same color'), SC_FoundationStack),
(n_('Rank'), RK_FoundationStack),
(n_('Spider same suit'), Spider_SS_Foundation),
(n_('Spider alternate color'), Spider_AC_Foundation),
(n_('Spider rank'), Spider_RK_Foundation),
),
default = n_('Same suit'),
label = _('Type:'),
var_name = 'found_type',
values_map=((n_('Same suit'), SS_FoundationStack),
(n_('Alternate color'), AC_FoundationStack),
(n_('Same color'), SC_FoundationStack),
(n_('Rank'), RK_FoundationStack),
(n_('Spider same suit'), Spider_SS_Foundation),
(n_('Spider alternate color'), Spider_AC_Foundation),
(n_('Spider rank'), Spider_RK_Foundation),
),
default=n_('Same suit'),
label=_('Type:'),
var_name='found_type',
)
FoundBaseCard = WizSetting(
values_map = ((n_('Ace'), ACE),
(n_('King'), KING),
(n_('Any'), ANY_RANK),
),
default = n_('Ace'),
label = _('Base card:'),
var_name = 'found_base_card',
values_map=((n_('Ace'), ACE),
(n_('King'), KING),
(n_('Any'), ANY_RANK),
),
default=n_('Ace'),
label=_('Base card:'),
var_name='found_base_card',
)
FoundDir = WizSetting(
values_map = ((n_('Up'), 1), (n_('Down'), -1)),
default = n_('Up'),
label = _('Direction:'),
var_name = 'found_dir',
values_map=((n_('Up'), 1), (n_('Down'), -1)),
default=n_('Up'),
label=_('Direction:'),
var_name='found_dir',
)
FoundMaxMove = WizSetting(
values_map = ((n_('None'), 0,), (n_('Top card'), 1)),
default = n_('Top card'),
label = _('Move:'),
var_name = 'found_max_move',
values_map=((n_('None'), 0,), (n_('Top card'), 1)),
default=n_('Top card'),
label=_('Move:'),
var_name='found_max_move',
)
FoundEqual = WizSetting(
values_map = (0, 1),
default = 1,
label = _('First card sets base cards:'),
var_name = 'found_equal',
widget = 'check',
values_map=(0, 1),
default=1,
label=_('First card sets base cards:'),
var_name='found_equal',
widget='check',
)
RowsNum = WizSetting(
values_map = (1, 20),
default = 8,
widget = 'spin',
label = _('Number of tableau piles:'),
var_name = 'rows_num',
values_map=(1, 20),
default=8,
widget='spin',
label=_('Number of tableau piles:'),
var_name='rows_num',
)
RowsType = WizSetting(
values_map = ((n_('Same suit'), SS_RowStack),
(n_('Alternate color'), AC_RowStack),
(n_('Same color'), SC_RowStack),
(n_('Rank'), RK_RowStack),
(n_('Any suit but the same'), BO_RowStack),
values_map=((n_('Same suit'), SS_RowStack),
(n_('Alternate color'), AC_RowStack),
(n_('Same color'), SC_RowStack),
(n_('Rank'), RK_RowStack),
(n_('Any suit but the same'), BO_RowStack),
(n_('Up or down by same suit'), UD_SS_RowStack),
(n_('Up or down by alternate color'), UD_AC_RowStack),
(n_('Up or down by rank'), UD_RK_RowStack),
(n_('Up or down by same color'), UD_SC_RowStack),
(n_('Up or down by same suit'), UD_SS_RowStack),
(n_('Up or down by alternate color'), UD_AC_RowStack),
(n_('Up or down by rank'), UD_RK_RowStack),
(n_('Up or down by same color'), UD_SC_RowStack),
(n_('Spider same suit'), Spider_SS_RowStack),
(n_('Spider alternate color'), Spider_AC_RowStack),
(n_('Spider same suit'), Spider_SS_RowStack),
(n_('Spider alternate color'), Spider_AC_RowStack),
(n_('Yukon same suit'), Yukon_SS_RowStack),
(n_('Yukon alternate color'), Yukon_AC_RowStack),
(n_('Yukon rank'), Yukon_RK_RowStack),
),
default = n_('Alternate color'),
label = _('Type:'),
var_name = 'rows_type',
(n_('Yukon same suit'), Yukon_SS_RowStack),
(n_('Yukon alternate color'), Yukon_AC_RowStack),
(n_('Yukon rank'), Yukon_RK_RowStack),
),
default=n_('Alternate color'),
label=_('Type:'),
var_name='rows_type',
)
RowsBaseCard = WizSetting(
values_map = ((n_('Ace'), ACE),
(n_('King'), KING),
(n_('Any'), ANY_RANK),
(n_('None'), NO_RANK),
),
default = n_('Any'),
label = _('Base card:'),
var_name = 'rows_base_card',
values_map=((n_('Ace'), ACE),
(n_('King'), KING),
(n_('Any'), ANY_RANK),
(n_('None'), NO_RANK),
),
default=n_('Any'),
label=_('Base card:'),
var_name='rows_base_card',
)
RowsDir = WizSetting(
values_map = ((n_('Up'), 1), (n_('Down'), -1)),
default = n_('Down'),
label = _('Direction:'),
var_name = 'rows_dir',
values_map=((n_('Up'), 1), (n_('Down'), -1)),
default=n_('Down'),
label=_('Direction:'),
var_name='rows_dir',
)
RowsMaxMove = WizSetting(
values_map = ((n_('Top card'), 1), (n_('Sequence'), UNLIMITED_MOVES)),
default = n_('Sequence'),
label = _('Move:'),
var_name = 'rows_max_move',
values_map=((n_('Top card'), 1), (n_('Sequence'), UNLIMITED_MOVES)),
default=n_('Sequence'),
label=_('Move:'),
var_name='rows_max_move',
)
RowsWrap = WizSetting(
values_map = (0, 1),
default = 0,
label = _('Wrapping:'),
var_name = 'rows_wrap',
widget = 'check',
values_map=(0, 1),
default=0,
label=_('Wrapping:'),
var_name='rows_wrap',
widget='check',
)
RowsSuperMove = WizSetting(
values_map = (0, 1),
default = 0,
label = _('Use "Super Move" feature:'),
var_name = 'rows_super_move',
widget = 'check',
values_map=(0, 1),
default=0,
label=_('Use "Super Move" feature:'),
var_name='rows_super_move',
widget='check',
)
ReservesNum = WizSetting(
values_map = (0, 20),
default = 4,
widget = 'spin',
label = _('Number of reserves:'),
var_name = 'reserves_num',
values_map=(0, 20),
default=4,
widget='spin',
label=_('Number of reserves:'),
var_name='reserves_num',
)
ReservesMaxAccept = WizSetting(
values_map = (0, 20),
default = 1,
widget = 'spin',
label = _('Max # of accepted cards:'),
var_name = 'reserves_max_accept',
values_map=(0, 20),
default=1,
widget='spin',
label=_('Max # of accepted cards:'),
var_name='reserves_max_accept',
)
DealType = WizSetting(
values_map = ((n_('Triangle'), 'triangle'),
(n_('Rectangle'), 'rectangle'),
),
default = n_('Rectangle'),
label = _('Type:'),
var_name = 'deal_type',
values_map=((n_('Triangle'), 'triangle'),
(n_('Rectangle'), 'rectangle'),
),
default=n_('Rectangle'),
label=_('Type:'),
var_name='deal_type',
)
DealFaceDown = WizSetting(
values_map = (0, 20),
default = 0,
widget = 'spin',
label = _('# of face-down cards dealt to the tableau pile:'),
var_name = 'deal_face_down',
values_map=(0, 20),
default=0,
widget='spin',
label=_('# of face-down cards dealt to the tableau pile:'),
var_name='deal_face_down',
)
DealFaceUp = WizSetting(
values_map = (0, 20),
default = 8,
widget = 'spin',
label = _('# of face-up cards dealt to the tableau pile:'),
var_name = 'deal_face_up',
values_map=(0, 20),
default=8,
widget='spin',
label=_('# of face-up cards dealt to the tableau pile:'),
var_name='deal_face_up',
)
DealToReseves = WizSetting(
values_map = (0, 208),
default = 0,
widget = 'spin',
label = _('# of cards dealt to the reserve:'),
var_name = 'deal_to_reserves',
values_map=(0, 208),
default=0,
widget='spin',
label=_('# of cards dealt to the reserve:'),
var_name='deal_to_reserves',
)
DealMaxCards = WizSetting(
values_map = (0, 208),
default = 52,
widget = 'spin',
label = _('Max # of dealt cards:'),
var_name = 'deal_max_cards',
values_map=(0, 208),
default=52,
widget='spin',
label=_('Max # of dealt cards:'),
var_name='deal_max_cards',
)
DealToFound = WizSetting(
values_map = (0, 1),
default = 0,
label = _('Deal first cards to the foundations:'),
var_name = 'deal_found',
widget = 'check',
values_map=(0, 1),
default=0,
label=_('Deal first cards to the foundations:'),
var_name='deal_found',
widget='check',
)
WizardWidgets = (
@ -350,14 +384,13 @@ 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
fn = os.path.join(d, 'customgame%d.py' % n) # file name
mn = 'customgame%d' % n # module name
gameid = 200000+n
if not os.path.exists(fn):
@ -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

2
tests/style/py-flake8.t
View file

@ -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." );