From d8ba8f71366b3659340134ef59edf9a9b19f6ecd Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 28 Apr 2017 14:17:05 +0300 Subject: [PATCH] Ran 2to3 on pysollib/[a-r]*.py --- pysollib/resource.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pysollib/resource.py b/pysollib/resource.py index 99c77df0..6ea850c9 100644 --- a/pysollib/resource.py +++ b/pysollib/resource.py @@ -379,7 +379,7 @@ class Cardset(Resource): ls = min(ls, 4) low_ranks, high_ranks = 1, 3 # if self.type == 3: high_ranks = 4 - for rank in range(0, low_ranks) + range(lr-high_ranks, lr): + for rank in list(range(0, low_ranks)) + list(range(lr-high_ranks, lr)): for suit in range(ls): index = suit * len(self.ranks) + rank pnames.append(names[index % len(names)]) @@ -413,42 +413,42 @@ class CardsetManager(ResourceManager): return 0 cs.si.type = s if s == CSI.TYPE_FRENCH: - cs.ranks = range(13) + cs.ranks = list(range(13)) cs.suits = "cshd" elif s == CSI.TYPE_HANAFUDA: cs.nbottoms = 15 - cs.ranks = range(4) + cs.ranks = list(range(4)) cs.suits = "abcdefghijkl" elif s == CSI.TYPE_TAROCK: cs.nbottoms = 8 - cs.ranks = range(14) + cs.ranks = list(range(14)) cs.suits = "cshd" - cs.trumps = range(22) + cs.trumps = list(range(22)) elif s == CSI.TYPE_MAHJONGG: - cs.ranks = range(10) + cs.ranks = list(range(10)) cs.suits = "abc" - cs.trumps = range(12) + cs.trumps = list(range(12)) # cs.nbottoms = 0 cs.nletters = 0 cs.nshadows = 0 elif s == CSI.TYPE_HEXADECK: cs.nbottoms = 8 - cs.ranks = range(16) + cs.ranks = list(range(16)) cs.suits = "cshd" - cs.trumps = range(4) + cs.trumps = list(range(4)) elif s == CSI.TYPE_MUGHAL_GANJIFA: cs.nbottoms = 11 - cs.ranks = range(12) + cs.ranks = list(range(12)) cs.suits = "abcdefgh" elif s == CSI.TYPE_NAVAGRAHA_GANJIFA: # ???return 0 ## FIXME cs.nbottoms = 12 - cs.ranks = range(12) + cs.ranks = list(range(12)) cs.suits = "abcdefghi" elif s == CSI.TYPE_DASHAVATARA_GANJIFA: cs.nbottoms = 13 - cs.ranks = range(12) + cs.ranks = list(range(12)) cs.suits = "abcdefghij" elif s == CSI.TYPE_TRUMP_ONLY: # ???return 0 ## FIXME @@ -461,7 +461,7 @@ class CardsetManager(ResourceManager): cs.nshadows = 0 cs.ranks = () cs.suits = "" - cs.trumps = range(cs.ncards) + cs.trumps = list(range(cs.ncards)) else: return 0