diff --git a/pysollib/games/zodiac.py b/pysollib/games/zodiac.py index 8759c812..2b9d0a75 100644 --- a/pysollib/games/zodiac.py +++ b/pysollib/games/zodiac.py @@ -24,16 +24,20 @@ __all__ = [] # imports -import sys # PySol imports from pysollib.gamedb import registerGame, GameInfo, GI -from pysollib.util import * -from pysollib.mfxutil import kwdefault -from pysollib.stack import * +from pysollib.util import KING, NO_RANK, UNLIMITED_REDEALS +from pysollib.stack import \ + OpenStack, \ + ReserveStack, \ + SS_FoundationStack, \ + SS_RowStack, \ + UD_SS_RowStack, \ + WasteStack, \ + WasteTalonStack from pysollib.game import Game from pysollib.layout import Layout -from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint # ************************************************************************ @@ -112,14 +116,12 @@ class Zodiac(Game): # define stack-groups l.defaultStackGroups() - def startGame(self): self.startDealSample() self.s.talon.dealRow(rows=self.s.reserves) self.s.talon.dealRow() self.s.talon.dealCards() - shallHighlightMatch = Game._shallHighlightMatch_SS @@ -185,7 +187,6 @@ class TwelveSleepingMaids(Game): # define stack-groups l.defaultStackGroups() - def startGame(self): for i in range(4): self.s.talon.dealRow(rows=self.s.reserves, flip=0, frames=0) @@ -193,11 +194,9 @@ class TwelveSleepingMaids(Game): self.s.talon.dealRow() self.s.talon.dealCards() - shallHighlightMatch = Game._shallHighlightMatch_SS - # register the game registerGame(GameInfo(467, Zodiac, "Zodiac", GI.GT_2DECK_TYPE, 2, -1, GI.SL_BALANCED)) diff --git a/tests/style/py-flake8.t b/tests/style/py-flake8.t index 2170dcd7..d7b65537 100644 --- a/tests/style/py-flake8.t +++ b/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' or $_ eq './pysollib/tile/ttk.py') } glob('./pysollib/*.py ./pysollib/[cmpuw]*/*.py ./pysollib/tile/*.py ./pysollib/ui/tktile/*.py') ); + grep { not($_ eq './pysollib/pysoltk.py' or $_ eq './pysollib/tile/ttk.py') } glob('./pysollib/*.py ./pysollib/[cmpuw]*/*.py ./pysollib/tile/*.py ./pysollib/ui/tktile/*.py ./pysollib/games/[z]*.py') ); # TEST eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." );