From 3ada0e3e0b0bc6cf9c56d2353f94d48ded413989 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Tue, 20 Feb 2018 01:41:40 +0200
Subject: [PATCH] Convert to six.moves.

---
 pysollib/game.py                    |  5 ++---
 pysollib/games/mahjongg/mahjongg.py | 15 ++++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pysollib/game.py b/pysollib/game.py
index bbc3c069..04559c29 100644
--- a/pysollib/game.py
+++ b/pysollib/game.py
@@ -29,9 +29,9 @@ import math
 import traceback
 
 from pysollib.mygettext import _
-
 from gettext import ungettext
 from six import BytesIO
+from six.moves import range
 
 # PySol imports
 from pysollib.mfxutil import Pickler, Unpickler, UnpicklingError
@@ -64,7 +64,6 @@ from pysollib.help import help_about
 if sys.version_info > (3,):
     basestring = str
     long = int
-    xrange = range
 
 PLAY_TIME_TIMEOUT = 200
 
@@ -1555,7 +1554,7 @@ class Game(object):
         cards = self.cards[:]
         scards = []
         ncards = min(10, len(cards))
-        for i in xrange(ncards):
+        for i in range(ncards):
             c = self.app.miscrandom.choice(cards)
             scards.append(c)
             cards.remove(c)
diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py
index 3ecf68d5..0546e8c8 100644
--- a/pysollib/games/mahjongg/mahjongg.py
+++ b/pysollib/games/mahjongg/mahjongg.py
@@ -22,7 +22,7 @@
 # ---------------------------------------------------------------------------
 
 # Imports
-import sys
+from six.moves import range
 import re
 import time
 from gettext import ungettext
@@ -45,15 +45,12 @@ from pysollib.stack import \
         InitialDealTalonStack, \
         OpenStack
 
-if sys.version_info > (3,):
-    xrange = range
-
 
 def factorial(x):
     if x <= 1:
         return 1
     a = 1
-    for i in xrange(x):
+    for i in range(x):
         a *= (i+1)
     return a
 
@@ -584,7 +581,7 @@ class AbstractMahjonggGame(Game):
             c1 = cards[0]
             del cards[0]
             c2 = None
-            for i in xrange(len(cards)):
+            for i in range(len(cards)):
                 if self.cardsMatch(c1, cards[i]):
                     c2 = cards[i]
                     del cards[i]
@@ -599,7 +596,7 @@ class AbstractMahjonggGame(Game):
             #
             i = factorial(len(free_stacks))//2//factorial(len(free_stacks)-2)
             old_pairs = []
-            for j in xrange(i):
+            for j in range(i):
                 nc = new_cards[:]
                 while True:
                     # create uniq pair
@@ -682,7 +679,7 @@ class AbstractMahjonggGame(Game):
             c1 = cards[0]
             del cards[0]
             c2 = None
-            for i in xrange(len(cards)):
+            for i in range(len(cards)):
                 if self.cardsMatch(c1, cards[i]):
                     c2 = cards[i]
                     del cards[i]
@@ -699,7 +696,7 @@ class AbstractMahjonggGame(Game):
             old_pairs = []
             i = factorial(len(suitable_stacks))//2 \
                 // factorial(len(suitable_stacks)-2)
-            for j in xrange(i):
+            for j in range(i):
                 if iters[0] > max_iters:
                     return None
                 if time.time() - start_time > max_time: