anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-15 02:54:09 -04:00
Code Releases Activity

Convert to six.moves.

Browse source
This commit is contained in:
Shlomi Fish 2018-02-20 01:41:40 +02:00
parent afcf0b5c9d
commit 3ada0e3e0b
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pysollib/game.py
View file

@ -29,9 +29,9 @@ import math
import traceback import traceback
from pysollib.mygettext import _ from pysollib.mygettext import _
from gettext import ungettext from gettext import ungettext
from six import BytesIO from six import BytesIO
from six.moves import range
# PySol imports # PySol imports
from pysollib.mfxutil import Pickler, Unpickler, UnpicklingError from pysollib.mfxutil import Pickler, Unpickler, UnpicklingError
@ -64,7 +64,6 @@ from pysollib.help import help_about
if sys.version_info > (3,): if sys.version_info > (3,):
basestring = str basestring = str
long = int long = int
xrange = range
PLAY_TIME_TIMEOUT = 200 PLAY_TIME_TIMEOUT = 200
@ -1555,7 +1554,7 @@ class Game(object):
cards = self.cards[:] cards = self.cards[:]
scards = [] scards = []
ncards = min(10, len(cards)) ncards = min(10, len(cards))
for i in xrange(ncards): for i in range(ncards):
c = self.app.miscrandom.choice(cards) c = self.app.miscrandom.choice(cards)
scards.append(c) scards.append(c)
cards.remove(c) cards.remove(c)

15
pysollib/games/mahjongg/mahjongg.py
View file

@ -22,7 +22,7 @@
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Imports # Imports
import sys from six.moves import range
import re import re
import time import time
from gettext import ungettext from gettext import ungettext
@ -45,15 +45,12 @@ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack OpenStack
if sys.version_info > (3,):
xrange = range
def factorial(x): def factorial(x):
if x <= 1: if x <= 1:
return 1 return 1
a = 1 a = 1
for i in xrange(x): for i in range(x):
a *= (i+1) a *= (i+1)
return a return a
@ -584,7 +581,7 @@ class AbstractMahjonggGame(Game):
c1 = cards[0] c1 = cards[0]
del cards[0] del cards[0]
c2 = None c2 = None
for i in xrange(len(cards)): for i in range(len(cards)):
if self.cardsMatch(c1, cards[i]): if self.cardsMatch(c1, cards[i]):
c2 = cards[i] c2 = cards[i]
del cards[i] del cards[i]
@ -599,7 +596,7 @@ class AbstractMahjonggGame(Game):
# #
i = factorial(len(free_stacks))//2//factorial(len(free_stacks)-2) i = factorial(len(free_stacks))//2//factorial(len(free_stacks)-2)
old_pairs = [] old_pairs = []
for j in xrange(i): for j in range(i):
nc = new_cards[:] nc = new_cards[:]
while True: while True:
# create uniq pair # create uniq pair
@ -682,7 +679,7 @@ class AbstractMahjonggGame(Game):
c1 = cards[0] c1 = cards[0]
del cards[0] del cards[0]
c2 = None c2 = None
for i in xrange(len(cards)): for i in range(len(cards)):
if self.cardsMatch(c1, cards[i]): if self.cardsMatch(c1, cards[i]):
c2 = cards[i] c2 = cards[i]
del cards[i] del cards[i]
@ -699,7 +696,7 @@ class AbstractMahjonggGame(Game):
old_pairs = [] old_pairs = []
i = factorial(len(suitable_stacks))//2 \ i = factorial(len(suitable_stacks))//2 \
// 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: if iters[0] > max_iters:
return None return None
if time.time() - start_time > max_time: if time.time() - start_time > max_time: