From 4670d046192d925ebda63641e11bb96e915393aa Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sat, 13 May 2017 21:28:03 +0300 Subject: [PATCH] 2to3 on pysollib/games/[a-g]*.py --- pysollib/games/glenwood.py | 2 +- pysollib/games/golf.py | 2 +- pysollib/games/grandfathersclock.py | 2 +- pysollib/games/gypsy.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py index f4747f83..28fb88a9 100644 --- a/pysollib/games/glenwood.py +++ b/pysollib/games/glenwood.py @@ -32,7 +32,7 @@ from pysollib.layout import Layout from pysollib.hint import CautiousDefaultHint from pysollib.pysoltk import MfxCanvasText -from canfield import Canfield_Hint +from pysollib.games.canfield import Canfield_Hint from pysollib.util import ANY_RANK, RANKS diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 995b5fcd..a6d5919a 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -34,7 +34,7 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.hint import BlackHoleSolverWrapper from pysollib.pysoltk import MfxCanvasText -from pileon import FourByFour_Hint +from pysollib.games.pileon import FourByFour_Hint from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, RANKS, \ SUITS, \ diff --git a/pysollib/games/grandfathersclock.py b/pysollib/games/grandfathersclock.py index 4b366d1f..cf096bcf 100644 --- a/pysollib/games/grandfathersclock.py +++ b/pysollib/games/grandfathersclock.py @@ -459,7 +459,7 @@ class BigBen(Game): def _shuffleHook(self, cards): # move clock cards to top of the Talon (i.e. first cards to be dealt) - C, S, H, D = range(4) # suits + C, S, H, D = list(range(4)) # suits t = [(1, C), (2, H), (3, S), (4, D), (5, C), (6, H), (7, S), (8, D), (9, C), (JACK, H), (QUEEN, S), (KING, D)] clocks = [] diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index debbdcc1..b1666661 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -32,7 +32,8 @@ from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import KlondikeType_Hint, YukonType_Hint -from spider import Spider_SS_Foundation, Spider_RowStack, Spider_Hint +from pysollib.games.spider import Spider_SS_Foundation, \ + Spider_RowStack, Spider_Hint from pysollib.util import ACE, ANY_SUIT, KING, UNLIMITED_ACCEPTS, \ UNLIMITED_MOVES