From 5ac5039687d3fcb86d75c6eec91a65b869233453 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sat, 3 Jun 2017 12:50:08 +0300 Subject: [PATCH] Convert the Layout_Method to staticmethod() This way it can be called as before in both python2 and python3. --- pysollib/games/bakersdozen.py | 2 +- pysollib/games/beleagueredcastle.py | 4 ++-- pysollib/games/freecell.py | 6 +++--- pysollib/games/gypsy.py | 18 +++++++++--------- pysollib/games/harp.py | 6 +++--- pysollib/games/klondike.py | 12 ++++++------ pysollib/games/sanibel.py | 2 +- pysollib/games/special/tarock.py | 2 +- pysollib/games/spider.py | 14 +++++++------- pysollib/games/ultra/dashavatara.py | 20 ++++++++++---------- pysollib/games/ultra/hanafuda.py | 14 +++++++------- pysollib/games/ultra/hanafuda1.py | 2 +- pysollib/games/ultra/hexadeck.py | 24 ++++++++++++------------ pysollib/games/ultra/mughal.py | 8 ++++---- pysollib/games/yukon.py | 14 +++++++------- 15 files changed, 74 insertions(+), 74 deletions(-) diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index f17fcb13..81582ecb 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -51,7 +51,7 @@ from pysollib.hint import FreeCellSolverWrapper # ************************************************************************ class CastlesInSpain(Game): - Layout_Method = Layout.bakersDozenLayout + Layout_Method = staticmethod(Layout.bakersDozenLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = SuperMoveAC_RowStack diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 633b4edb..4ec41012 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -200,7 +200,7 @@ class ExiledKings(Citadel): # ************************************************************************ class Fortress(Game): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = UD_SS_RowStack @@ -250,7 +250,7 @@ class Fortress(Game): # ************************************************************************ class Bastion(Game): - Layout_Method = Layout.freeCellLayout + Layout_Method = staticmethod(Layout.freeCellLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = UD_SS_RowStack diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index a8a186bc..b9d77c57 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -61,7 +61,7 @@ from pysollib.stack import \ class FreeCell(Game): - Layout_Method = Layout.freeCellLayout + Layout_Method = staticmethod(Layout.freeCellLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = SuperMoveAC_RowStack @@ -77,9 +77,9 @@ class FreeCell(Game): # create layout l, s = Layout(self), self.s kwdefault(layout, rows=8, reserves=4, texts=0) - # self.Layout_Method(l, **layout) + self.Layout_Method(l, **layout) # self.__class__.__dict__['Layout_Method'](l, **layout) - self.__class__.Layout_Method(l, **layout) + # self.__class__.Layout_Method(l, **layout) self.setSize(l.size[0], l.size[1]) # create stacks s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index b1666661..a19571b4 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -63,7 +63,7 @@ from pysollib.stack import \ # ************************************************************************ class Gypsy(Game): - Layout_Method = Layout.gypsyLayout + Layout_Method = staticmethod(Layout.gypsyLayout) Talon_Class = DealRowTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack @@ -135,7 +135,7 @@ class Irmgard_Talon(TalonStack): class Irmgard(Gypsy): GAME_VERSION = 2 - Layout_Method = Layout.harpLayout + Layout_Method = staticmethod(Layout.harpLayout) Talon_Class = Irmgard_Talon RowStack_Class = KingAC_RowStack @@ -381,7 +381,7 @@ class Griffon(Mississippi): # ************************************************************************ class Blockade(Gypsy): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) RowStack_Class = SS_RowStack def createGame(self): @@ -402,7 +402,7 @@ class Blockade(Gypsy): class PhantomBlockade(Gypsy): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) RowStack_Class = KingAC_RowStack def createGame(self): @@ -528,7 +528,7 @@ class Surprise(Gypsy): # ************************************************************************ class Elba(Gypsy): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) RowStack_Class = KingAC_RowStack def createGame(self): @@ -546,7 +546,7 @@ class Elba(Gypsy): # ************************************************************************ class Millie(Gypsy): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) def createGame(self): Gypsy.createGame(self, playcards=24) @@ -563,7 +563,7 @@ class Millie(Gypsy): # ************************************************************************ class Hypotenuse(Gypsy): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) RowStack_Class = KingAC_RowStack def createGame(self): @@ -733,7 +733,7 @@ class Flamenco(Gypsy): # ************************************************************************ class Eclipse(Gypsy): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) RowStack_Class = SS_RowStack def createGame(self): @@ -754,7 +754,7 @@ class Eclipse(Gypsy): # ************************************************************************ class BrazilianPatience(Gypsy): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) RowStack_Class = KingAC_RowStack def createGame(self): diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index dcab40ad..e4e67228 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -55,7 +55,7 @@ from pysollib.stack import \ class DoubleKlondike(Game): - Layout_Method = Layout.harpLayout + Layout_Method = staticmethod(Layout.harpLayout) Foundation_Class = SS_FoundationStack RowStack_Class = KingAC_RowStack Hint_Class = KlondikeType_Hint @@ -301,7 +301,7 @@ class DoubleKingsley(DoubleKlondike): # ************************************************************************ class ThievesOfEgypt(DoubleKlondike): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) def createGame(self): DoubleKlondike.createGame(self, rows=10, max_rounds=2) @@ -323,7 +323,7 @@ class ThievesOfEgypt(DoubleKlondike): # ************************************************************************ class Brush(DoubleKlondike): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Foundation_Class = Spider_SS_Foundation RowStack_Class = Spider_RowStack Hint_Class = Spider_Hint diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index acb184a9..187c4104 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -69,7 +69,7 @@ from pysollib.stack import \ class Klondike(Game): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = KingAC_RowStack @@ -79,8 +79,8 @@ class Klondike(Game): # create layout l, s = Layout(self), self.s kwdefault(layout, rows=7, waste=1, texts=1, playcards=16) - # self.Layout_Method.__get__(l, l.__class__)(**layout) - self.__class__.Layout_Method(l, **layout) + self.Layout_Method.__get__(l, l.__class__)(**layout) + # self.__class__.Layout_Method(l, **layout) self.setSize(l.size[0], l.size[1]) # create stacks s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, @@ -213,7 +213,7 @@ class Whitehead(Klondike): # ************************************************************************ class SmallHarp(Klondike): - Layout_Method = Layout.gypsyLayout + Layout_Method = staticmethod(Layout.gypsyLayout) def startGame(self): for i in range(len(self.s.rows)): @@ -421,7 +421,7 @@ class AgnesSorel(Klondike): # ************************************************************************ class EightTimesEight(Klondike): - Layout_Method = Layout.gypsyLayout + Layout_Method = staticmethod(Layout.gypsyLayout) RowStack_Class = AC_RowStack def createGame(self): @@ -451,7 +451,7 @@ class EightByEight_RowStack(RK_RowStack): class EightByEight(EightTimesEight): - Layout_Method = Layout.klondikeLayout # gypsyLayout + Layout_Method = staticmethod(Layout.klondikeLayout) # gypsyLayout Talon_Class = CanfieldRush_Talon RowStack_Class = EightByEight_RowStack diff --git a/pysollib/games/sanibel.py b/pysollib/games/sanibel.py index e6e34733..9c33e0d8 100644 --- a/pysollib/games/sanibel.py +++ b/pysollib/games/sanibel.py @@ -44,7 +44,7 @@ from pysollib.stack import \ class Sanibel(Gypsy): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = StackWrapper(WasteTalonStack, max_rounds=1) Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) RowStack_Class = Yukon_AC_RowStack diff --git a/pysollib/games/special/tarock.py b/pysollib/games/special/tarock.py index 841ffe8a..647f410e 100644 --- a/pysollib/games/special/tarock.py +++ b/pysollib/games/special/tarock.py @@ -841,7 +841,7 @@ class Ponytail(Tarock_GameMethods, Braid): # ************************************************************************ class Cavalier(AbstractTarockGame): - Layout_Method = Layout.bakersDozenLayout + Layout_Method = staticmethod(Layout.bakersDozenLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = Cavalier_RowStack diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 9b80f4e1..a3276663 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -130,7 +130,7 @@ class SuperMoveSpider_RowStack(SuperMoveStack_StackMethods, Spider_RowStack): # ************************************************************************ class RelaxedSpider(Game): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = DealRowTalonStack Foundation_Class = Spider_SS_Foundation RowStack_Class = Spider_RowStack @@ -140,9 +140,9 @@ class RelaxedSpider(Game): # create layout l, s = Layout(self), self.s kwdefault(layout, rows=10, waste=0, texts=1, playcards=23) - # self.Layout_Method(l, **layout) + self.Layout_Method(l, **layout) # self.__class__.__dict__['Layout_Method'](l, **layout) - self.__class__.Layout_Method(l, **layout) + # self.__class__.Layout_Method(l, **layout) self.setSize(l.size[0], l.size[1]) # create stacks s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) @@ -227,7 +227,7 @@ class GroundsForADivorce_Talon(TalonStack): class GroundsForADivorce(RelaxedSpider): - Layout_Method = Layout.harpLayout + Layout_Method = staticmethod(Layout.harpLayout) Talon_Class = GroundsForADivorce_Talon Foundation_Class = StackWrapper( Spider_SS_Foundation, base_rank=ANY_RANK, mod=13) @@ -250,7 +250,7 @@ class GroundsForADivorce(RelaxedSpider): # ************************************************************************ class GrandmothersGame(RelaxedSpider): - Layout_Method = Layout.harpLayout + Layout_Method = staticmethod(Layout.harpLayout) def createGame(self): RelaxedSpider.createGame(self, playcards=22) @@ -494,7 +494,7 @@ class RougeEtNoir_RowStack(KingAC_RowStack): class RougeEtNoir(Game): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = DealRowTalonStack RowStack_Class = RougeEtNoir_RowStack @@ -755,7 +755,7 @@ class Chelicera(Game): class ScorpionHead(Scorpion): - Layout_Method = Layout.freeCellLayout + Layout_Method = staticmethod(Layout.freeCellLayout) def createGame(self, **layout): diff --git a/pysollib/games/ultra/dashavatara.py b/pysollib/games/ultra/dashavatara.py index 85bb07b6..77074a67 100644 --- a/pysollib/games/ultra/dashavatara.py +++ b/pysollib/games/ultra/dashavatara.py @@ -528,7 +528,7 @@ class TenAvatars(AbstractDashavataraGame): # ***********************************************************************/ class Balarama(AbstractDashavataraGame): - Layout_Method = Layout.ghulamLayout + Layout_Method = staticmethod(Layout.ghulamLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = Dashavatara_AC_RowStack @@ -589,7 +589,7 @@ class Balarama(AbstractDashavataraGame): # ***********************************************************************/ class Hayagriva(Balarama): - Layout_Method = Layout.ghulamLayout + Layout_Method = staticmethod(Layout.ghulamLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = Dashavatara_RK_RowStack @@ -612,7 +612,7 @@ class Hayagriva(Balarama): # ***********************************************************************/ class Shanka(Balarama): - Layout_Method = Layout.ghulamLayout + Layout_Method = staticmethod(Layout.ghulamLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = Dashavatara_RK_RowStack @@ -639,7 +639,7 @@ class Shanka(Balarama): # ***********************************************************************/ class Surukh(Balarama): - Layout_Method = Layout.ghulamLayout + Layout_Method = staticmethod(Layout.ghulamLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = Dashavatara_AF_RowStack @@ -671,7 +671,7 @@ class Surukh(Balarama): # ***********************************************************************/ class Matsya(AbstractDashavataraGame): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = RK_RowStack @@ -727,7 +727,7 @@ class Matsya(AbstractDashavataraGame): # ***********************************************************************/ class Kurma(Matsya): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = SS_RowStack @@ -746,7 +746,7 @@ class Kurma(Matsya): # ***********************************************************************/ class Varaha(Matsya): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = SS_RowStack @@ -765,7 +765,7 @@ class Varaha(Matsya): # ***********************************************************************/ class Narasimha(Matsya): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack @@ -789,7 +789,7 @@ class Narasimha(Matsya): # ***********************************************************************/ class Vamana(Matsya): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack @@ -813,7 +813,7 @@ class Vamana(Matsya): # ***********************************************************************/ class Parashurama(Matsya): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = RK_RowStack diff --git a/pysollib/games/ultra/hanafuda.py b/pysollib/games/ultra/hanafuda.py index 84c2f718..fcf7a719 100644 --- a/pysollib/games/ultra/hanafuda.py +++ b/pysollib/games/ultra/hanafuda.py @@ -228,7 +228,7 @@ class Gaji(AbstractFlowerGame): # ***********************************************************************/ class Oonsoo(AbstractFlowerGame): - Layout_Method = Layout.oonsooLayout + Layout_Method = staticmethod(Layout.oonsooLayout) Talon_Class = DealRowTalonStack RowStack_Class = Oonsoo_SequenceStack Rows = 12 @@ -654,7 +654,7 @@ class FourWinds(AbstractFlowerGame): # ************************************************************************ class Sumo(AbstractFlowerGame): - Layout_Method = Layout.sumoLayout + Layout_Method = staticmethod(Layout.sumoLayout) Talon_Class = InitialDealTalonStack Foundation_Class = Hanafuda_SS_FoundationStack RowStack_Class = Hanafuda_SequenceStack @@ -702,7 +702,7 @@ class Sumo(AbstractFlowerGame): # ************************************************************************ class BigSumo(AbstractFlowerGame): - Layout_Method = Layout.sumoLayout + Layout_Method = staticmethod(Layout.sumoLayout) Talon_Class = InitialDealTalonStack Foundation_Class = Hanafuda_SS_FoundationStack RowStack_Class = Hanafuda_SequenceStack @@ -748,7 +748,7 @@ class BigSumo(AbstractFlowerGame): # ************************************************************************ class Samuri(AbstractFlowerGame): - Layout_Method = Layout.samuriLayout + Layout_Method = staticmethod(Layout.samuriLayout) Talon_Class = WasteTalonStack Foundation_Class = Hanafuda_SS_FoundationStack RowStack_Class = Hanafuda_SequenceStack @@ -826,7 +826,7 @@ class SuperSamuri(DoubleSamuri): # ************************************************************************ class LittleEasy(AbstractFlowerGame): - Layout_Method = Layout.easyLayout + Layout_Method = staticmethod(Layout.easyLayout) Talon_Class = WasteTalonStack Foundation_Class = FourWinds_Foundation RowStack_Class = Hanafuda_SequenceStack @@ -913,7 +913,7 @@ class EasySupreme(LittleEasy): # ************************************************************************ class JustForFun(AbstractFlowerGame): - Layout_Method = Layout.funLayout + Layout_Method = staticmethod(Layout.funLayout) Talon_Class = InitialDealTalonStack Foundation_Class = FourWinds_Foundation RowStack_Class = Hanafuda_SequenceStack @@ -990,7 +990,7 @@ class CherryBomb(Firecracker): # ************************************************************************ class Paulownia(AbstractFlowerGame): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = Hanafuda_SS_FoundationStack RowStack_Class = Hanafuda_SequenceStack diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py index dbd39487..76ab3863 100644 --- a/pysollib/games/ultra/hanafuda1.py +++ b/pysollib/games/ultra/hanafuda1.py @@ -66,7 +66,7 @@ from pysollib.stack import \ class Paulownia(AbstractFlowerGame): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = Hanafuda_SS_FoundationStack RowStack_Class = Hanafuda_SequenceStack diff --git a/pysollib/games/ultra/hexadeck.py b/pysollib/games/ultra/hexadeck.py index ec1e470f..e345cd15 100644 --- a/pysollib/games/ultra/hexadeck.py +++ b/pysollib/games/ultra/hexadeck.py @@ -410,7 +410,7 @@ class BitsNBytes(Game): class HexAKlon(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = HexAKlon_RowStack @@ -476,7 +476,7 @@ class HexAKlon(Game): class HexAKlonByThrees(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = HexAKlon_RowStack @@ -542,7 +542,7 @@ class HexAKlonByThrees(Game): class KingOnlyHexAKlon(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = HexAKlon_RowStack @@ -616,7 +616,7 @@ class KingOnlyHexAKlon(Game): class KlondikePlus16(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = HexAKlon_RowStack @@ -674,7 +674,7 @@ class KlondikePlus16(Game): class TheFamiliar(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack @@ -739,7 +739,7 @@ class TheFamiliar(Game): class TwoFamiliars(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack @@ -804,7 +804,7 @@ class TwoFamiliars(Game): class TenByEight(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.gypsyLayout + Layout_Method = staticmethod(Layout.gypsyLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack @@ -865,7 +865,7 @@ class TenByEight(Game): class Drawbridge(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.harpLayout + Layout_Method = staticmethod(Layout.harpLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack @@ -924,7 +924,7 @@ class Drawbridge(Game): class DoubleDrawbridge(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.harpLayout + Layout_Method = staticmethod(Layout.harpLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack @@ -984,7 +984,7 @@ class DoubleDrawbridge(Game): class HiddenPassages(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack @@ -1058,7 +1058,7 @@ class HiddenPassages(Game): class CluitjarsLair(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = HexADeck_ACRowStack @@ -1276,7 +1276,7 @@ class MerlinsMeander(AbstractHexADeckGame): class MagesGame(Game): Hint_Class = CautiousDefaultHint - Layout_Method = Layout.gypsyLayout + Layout_Method = staticmethod(Layout.gypsyLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = AC_RowStack diff --git a/pysollib/games/ultra/mughal.py b/pysollib/games/ultra/mughal.py index 03c8d650..14e8380a 100644 --- a/pysollib/games/ultra/mughal.py +++ b/pysollib/games/ultra/mughal.py @@ -443,7 +443,7 @@ class EightLegions(AbstractMughalGame): # ***********************************************************************/ class Shamsher(AbstractMughalGame): - Layout_Method = Layout.ghulamLayout + Layout_Method = staticmethod(Layout.ghulamLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = RK_RowStack @@ -501,7 +501,7 @@ class Shamsher(AbstractMughalGame): # ***********************************************************************/ class Ashrafi(Shamsher): - Layout_Method = Layout.ghulamLayout + Layout_Method = staticmethod(Layout.ghulamLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = RK_RowStack @@ -520,7 +520,7 @@ class Ashrafi(Shamsher): # ***********************************************************************/ class Ghulam(Shamsher): - Layout_Method = Layout.ghulamLayout + Layout_Method = staticmethod(Layout.ghulamLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = SS_RowStack @@ -544,7 +544,7 @@ class Ghulam(Shamsher): # ***********************************************************************/ class Tipati(AbstractMughalGame): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = RK_RowStack diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index ae81bb5e..7658dd74 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -56,7 +56,7 @@ from pysollib.games.spider import Spider_SS_Foundation # ************************************************************************ class Yukon(Game): - Layout_Method = Layout.yukonLayout + Layout_Method = staticmethod(Layout.yukonLayout) Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = StackWrapper(Yukon_AC_RowStack, base_rank=KING) @@ -221,7 +221,7 @@ class Roslin(Yukon): # ************************************************************************ class ChineseDiscipline(Yukon): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = DealRowTalonStack def createGame(self): @@ -244,7 +244,7 @@ class ChineseSolitaire(ChineseDiscipline): # ************************************************************************ class Queenie(Yukon): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = DealRowTalonStack def createGame(self): @@ -263,7 +263,7 @@ class Queenie(Yukon): # ************************************************************************ class Rushdike(RussianSolitaire): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) Talon_Class = DealRowTalonStack def createGame(self): @@ -399,7 +399,7 @@ class TenAcross(Yukon): Foundation_Class = Spider_SS_Foundation RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) - Layout_Method = Layout.freeCellLayout + Layout_Method = staticmethod(Layout.freeCellLayout) # # game layout @@ -520,7 +520,7 @@ class BimBom(AustralianPatience): # ************************************************************************ class Geoffrey(Yukon): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) def createGame(self): @@ -542,7 +542,7 @@ class Geoffrey(Yukon): # ************************************************************************ class Queensland(Yukon): - Layout_Method = Layout.klondikeLayout + Layout_Method = staticmethod(Layout.klondikeLayout) RowStack_Class = Yukon_SS_RowStack def createGame(self):