anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-03-12 04:07:01 -04:00
Code Releases Activity

Order imports based on flake8-import-order.

Browse source 
Tested on ci. See https://github.com/PyCQA/flake8-import-order . In the
process did some other cleanups and
https://en.wikipedia.org/wiki/Code_refactoring .
This commit is contained in:
Shlomi Fish 2019-01-11 18:43:29 +02:00
parent 8f8e1304f8
commit ed18fd8156
210 changed files with 1238 additions and 1952 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.appveyor.yml
View file

@ -8,13 +8,14 @@ install:
- choco install strawberryperl
- copy %PYTHON%\python.exe %PYTHON%\python3.exe
- SET PATH=%PYTHON%;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%
- python3 -mpip install Pillow
- python3 -mpip install flake8
- python3 -mpip install random2
- python3 -mpip install flake8-import-order
- python3 -mpip install py2exe
- python3 -mpip install pycotap
- python3 -mpip install six
- python3 -mpip install Pillow
- python3 -mpip install pygame
- python3 -mpip install random2
- python3 -mpip install six
- perl -v
- copy C:\msys64\mingw64\bin\mingw32-make.exe C:\msys64\mingw64\bin\make.exe
- SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%

2
.travis.yml
View file

@ -24,7 +24,7 @@ before_install:
install:
- sudo cpanm Code::TidyAll::Plugin::Flake8 Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace
- export PY_MODS='pycotap random2 six'
- "`which python3` -m pip install --upgrade flake8 $PY_MODS"
- "`which python3` -m pip install --upgrade flake8 flake8-import-order $PY_MODS"
- "sudo /usr/bin/python3 -m pip install --upgrade $PY_MODS || true"
- "sudo `which python2` -m pip install --upgrade $PY_MODS"
- which python

13
android/initsdk.py
View file

@ -1,15 +1,18 @@
#! /usr/bin/env python3
# -*- coding: iso-8859-1 -*-
import sys
import os
import requests
import logging
import hashlib
import glob
import hashlib
import logging
import os
import sys
from zipfile import ZipFile, ZipInfo
from clint.textui import progress
import requests
cachefiles = [
('https://dl.google.com/android/repository/platform-tools-latest-linux.zip',
'',

1
data/themes/clearlooks/create_imgs.py
View file

@ -2,6 +2,7 @@
# -*- mode: python; coding: koi8-r; -*-
import os
import gtk
imdir = 'images'

10
html-src/gen-html.py
View file

@ -1,13 +1,13 @@
#!/usr/bin/env python3
import sys
import os
import builtins
from pysollib.mygettext import fix_gettext
import os
import sys
from pysollib.gamedb import GAME_DB
from pysollib.gamedb import GI
from pysollib.mfxutil import latin1_normalize
from pysollib.mygettext import fix_gettext
# outdir = '../html'
pysollib_dir = '../'
@ -15,10 +15,10 @@ pysollib_dir = '../'
builtins._ = lambda x: x
builtins.n_ = lambda x: x
import pysollib.games # noqa: F402
import pysollib.games # noqa: F402,I100,I202
import pysollib.games.mahjongg # noqa: F402
import pysollib.games.ultra # noqa: F402
import pysollib.games.special # noqa: F401,F402
import pysollib.games.ultra # noqa: F401,F402
try:
os.mkdir('html')

3
pysol.py
View file

@ -33,8 +33,7 @@ init()
# HAS TO BE after call to init().
# See docs/README.SOURCE.
# Flake8 test would complain here E402, so disabled
from pysollib.main import main # noqa: E402
from pysollib.main import main # noqa: E402,I202
# Execute it.
# import profile

45
pysollib/actions.py
View file

@ -21,41 +21,34 @@
#
# ---------------------------------------------------------------------------##
# imports
import os
import locale
import os
# PySol imports
from pysollib.gamedb import GI
from pysollib.help import help_about, help_html
from pysollib.mfxutil import Struct, openURL
from pysollib.mfxutil import print_err
from pysollib.pysolrandom import constructRandom
from pysollib.settings import TITLE, PACKAGE_URL
from pysollib.settings import TOP_TITLE
from pysollib.settings import DEBUG
from pysollib.gamedb import GI
# stats imports
from pysollib.stats import FileStatsFormatter
from pysollib.pysoltk import SingleGame_StatsDialog, AllGames_StatsDialog
from pysollib.pysoltk import FullLog_StatsDialog, SessionLog_StatsDialog
from pysollib.pysoltk import Status_StatsDialog, Top_StatsDialog
from pysollib.pysoltk import ProgressionDialog
from pysollib.pysoltk import GameInfoDialog
# toolkit imports
from pysollib.mygettext import _
from pysollib.pysoltk import MfxMessageDialog, MfxSimpleEntry
from pysollib.pysoltk import MfxExceptionDialog
from pysollib.pysoltk import PlayerOptionsDialog
from pysollib.pysoltk import TimeoutsDialog
from pysollib.pysolrandom import constructRandom
from pysollib.pysoltk import AllGames_StatsDialog, SingleGame_StatsDialog
from pysollib.pysoltk import ColorsDialog
from pysollib.pysoltk import FontsDialog
from pysollib.pysoltk import EditTextDialog
from pysollib.pysoltk import FontsDialog
from pysollib.pysoltk import FullLog_StatsDialog, SessionLog_StatsDialog
from pysollib.pysoltk import GameInfoDialog
from pysollib.pysoltk import MfxExceptionDialog
from pysollib.pysoltk import MfxMessageDialog, MfxSimpleEntry
from pysollib.pysoltk import PlayerOptionsDialog
from pysollib.pysoltk import ProgressionDialog
from pysollib.pysoltk import PysolMenubarTk, PysolToolbarTk
from pysollib.pysoltk import Status_StatsDialog, Top_StatsDialog
from pysollib.pysoltk import TimeoutsDialog
from pysollib.pysoltk import create_find_card_dialog
from pysollib.pysoltk import create_solver_dialog
from pysollib.pysoltk import PysolMenubarTk, PysolToolbarTk
from pysollib.help import help_about, help_html
from pysollib.settings import DEBUG
from pysollib.settings import PACKAGE_URL, TITLE
from pysollib.settings import TOP_TITLE
from pysollib.stats import FileStatsFormatter
# ************************************************************************

47
pysollib/app.py
View file

@ -28,37 +28,34 @@ import re
import traceback
from pickle import UnpicklingError
# PySol imports
from pysollib.mfxutil import destruct, Struct
from pysollib.mfxutil import pickle, unpickle
from pysollib.mfxutil import getusername, getprefdir
from pysollib.mfxutil import latin1_normalize, print_err
from pysollib.mfxutil import USE_PIL
from pysollib.util import CARDSET, IMAGE_EXTENSIONS
from pysollib.settings import PACKAGE, VERSION_TUPLE, WIN_SYSTEM
from pysollib.resource import CSI, CardsetConfig, Cardset, CardsetManager
from pysollib.resource import Tile, TileManager
from pysollib.resource import Sample, SampleManager
from pysollib.resource import Music, MusicManager
from pysollib.gamedb import GAME_DB, GI, loadGame
from pysollib.images import Images, SubsampledImages
from pysollib.pysolrandom import PysolRandom
from pysollib.gamedb import GI, GAME_DB, loadGame
from pysollib.options import Options
from pysollib.settings import TOP_SIZE, TOOLKIT
from pysollib.settings import DEBUG
from pysollib.winsystems import TkSettings
# Toolkit imports
from pysollib.mfxutil import Struct, destruct
from pysollib.mfxutil import USE_PIL
from pysollib.mfxutil import getprefdir, getusername
from pysollib.mfxutil import latin1_normalize, print_err
from pysollib.mfxutil import pickle, unpickle
from pysollib.mygettext import _
from pysollib.pysoltk import wm_withdraw, loadImage
from pysollib.pysoltk import MfxDialog, MfxMessageDialog, MfxExceptionDialog
from pysollib.pysoltk import TclError, MfxScrolledCanvas
from pysollib.options import Options
from pysollib.pysolrandom import PysolRandom
from pysollib.pysoltk import HTMLViewer
from pysollib.pysoltk import HelpStatusbar, PysolStatusbar
from pysollib.pysoltk import MfxDialog, MfxExceptionDialog, MfxMessageDialog
from pysollib.pysoltk import MfxScrolledCanvas, TclError
from pysollib.pysoltk import PysolProgressBar
from pysollib.pysoltk import PysolStatusbar, HelpStatusbar
from pysollib.pysoltk import SelectCardsetDialogWithPreview
from pysollib.pysoltk import SelectDialogTreeData
from pysollib.pysoltk import HTMLViewer
from pysollib.pysoltk import destroy_find_card_dialog
from pysollib.pysoltk import loadImage, wm_withdraw
from pysollib.resource import CSI, Cardset, CardsetConfig, CardsetManager
from pysollib.resource import Music, MusicManager
from pysollib.resource import Sample, SampleManager
from pysollib.resource import Tile, TileManager
from pysollib.settings import DEBUG
from pysollib.settings import PACKAGE, VERSION_TUPLE, WIN_SYSTEM
from pysollib.settings import TOOLKIT, TOP_SIZE
from pysollib.util import CARDSET, IMAGE_EXTENSIONS
from pysollib.winsystems import TkSettings
if TOOLKIT == 'tk':
from pysollib.ui.tktile.solverdialog import destroy_solver_dialog
else:

9
pysollib/configobj/configobj.py
View file

@ -17,13 +17,14 @@
# Comments, suggestions and bug reports welcome.
import sys
import os
import re
import six
from six import string_types
import sys
from warnings import warn
import six
from six import string_types
INTP_VER = sys.version_info[:2]
if INTP_VER < (2, 2):
raise RuntimeError("Python v.2.2 or later needed")

5
pysollib/configobj/validate.py
View file

@ -124,9 +124,10 @@
A badly formatted set of arguments will raise a ``VdtParamError``.
"""
import sys
import six
import re
import sys
import six
__docformat__ = "restructuredtext en"

33
pysollib/customgame.py
View file

@ -21,28 +21,28 @@
#
# ---------------------------------------------------------------------------##
import six
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, \
KING, \
UNLIMITED_MOVES
from pysollib.stack import Spider_AC_Foundation, \
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import Yukon_Hint
from pysollib.layout import Layout
from pysollib.stack import \
AC_RowStack, \
BO_RowStack, \
DealReserveRedealTalonStack, \
DealRowRedealTalonStack, \
RK_RowStack, \
GroundsForADivorceTalonStack, \
InitialDealTalonStack, \
OpenStack, \
RK_RowStack, \
ReserveStack, \
SC_RowStack, \
SS_RowStack, \
SpiderTalonStack, \
Spider_AC_Foundation, \
Spider_AC_RowStack, \
Spider_RK_Foundation, \
Spider_SS_Foundation, \
Spider_SS_RowStack, \
SpiderTalonStack, \
SC_RowStack, \
SS_RowStack, \
StackWrapper, \
SuperMoveAC_RowStack, \
SuperMoveBO_RowStack, \
@ -56,14 +56,15 @@ from pysollib.stack import Spider_AC_Foundation, \
WasteStack, \
WasteTalonStack, \
Yukon_AC_RowStack, \
Yukon_SS_RowStack, \
Yukon_RK_RowStack
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import Yukon_Hint
Yukon_RK_RowStack, \
Yukon_SS_RowStack
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, \
KING, \
UNLIMITED_MOVES
from pysollib.wizardutil import WizardWidgets
import six
# ************************************************************************
# *
# ************************************************************************

42
pysollib/game.py
View file

@ -23,35 +23,35 @@
# imports
import time
import math
import time
import traceback
import six
from pysollib.mygettext import _
from gettext import ungettext
from six import BytesIO
from six.moves import range
from pickle import Pickler, Unpickler, UnpicklingError
# PySol imports
from pysollib.gamedb import GI
from pysollib.mfxutil import Image, ImageTk, USE_PIL
from pysollib.mfxutil import destruct, Struct, SubclassResponsibility
from pysollib.mfxutil import uclock, usleep
from pysollib.mfxutil import Struct, SubclassResponsibility, destruct
from pysollib.mfxutil import format_time, print_err
from pysollib.mfxutil import uclock, usleep
from pysollib.mygettext import _
from pysollib.mygettext import ungettext
from pysollib.pysolrandom import LCRandom31, PysolRandom, constructRandom, \
random__long2str, random__str2long
from pysollib.pysoltk import CURSOR_WATCH
from pysollib.pysoltk import Card
from pysollib.pysoltk import EVENT_HANDLED, EVENT_PROPAGATE
from pysollib.pysoltk import MfxCanvasLine, MfxCanvasRectangle, MfxCanvasText
from pysollib.pysoltk import MfxExceptionDialog, MfxMessageDialog
from pysollib.pysoltk import after, after_cancel, after_idle
from pysollib.pysoltk import bind, wm_map
from pysollib.settings import DEBUG
from pysollib.settings import PACKAGE, TITLE, TOOLKIT, TOP_TITLE
from pysollib.settings import VERSION, VERSION_TUPLE
from pysollib.settings import DEBUG
from pysollib.gamedb import GI
from pysollib.pysolrandom import PysolRandom, LCRandom31, constructRandom, \
random__long2str, random__str2long
from pysollib.pysoltk import EVENT_HANDLED, EVENT_PROPAGATE
from pysollib.pysoltk import CURSOR_WATCH
from pysollib.pysoltk import bind, wm_map
from pysollib.pysoltk import after, after_idle, after_cancel
from pysollib.pysoltk import MfxMessageDialog, MfxExceptionDialog
from pysollib.pysoltk import MfxCanvasText, MfxCanvasLine, MfxCanvasRectangle
from pysollib.pysoltk import Card
import six
from six import BytesIO
from six.moves import range
if TOOLKIT == 'tk':
from pysollib.ui.tktile.solverdialog import reset_solver_dialog
else:

10
pysollib/gamedb.py
View file

@ -22,16 +22,14 @@
# ---------------------------------------------------------------------------##
# imports
import six
import imp
# PySol imports
from pysollib.mfxutil import Struct, print_err
from pysollib.resource import CSI
import pysollib.settings
from pysollib.mfxutil import Struct, print_err
from pysollib.mygettext import _, n_
from pysollib.resource import CSI
import six
# ************************************************************************
# * constants

27
pysollib/games/acesup.py
View file

@ -20,30 +20,25 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.montecarlo import MonteCarlo_RowStack
from pysollib.layout import Layout
from pysollib.stack import \
AbstractFoundationStack, \
BasicRowStack, \
DealRowTalonStack, \
isRankSequence, \
OpenStack, \
ReserveStack, \
RK_RowStack, \
TalonStack, \
ReserveStack, \
Spider_RK_Foundation, \
Stack, \
StackWrapper
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.games.montecarlo import MonteCarlo_RowStack
StackWrapper, \
TalonStack, \
isRankSequence
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
# ************************************************************************

19
pysollib/games/algerian.py
View file

@ -21,27 +21,24 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, KING
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.stack import \
DealRowTalonStack, \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
UD_SS_RowStack, \
StackWrapper
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
StackWrapper, \
UD_SS_RowStack
from pysollib.util import ACE, KING
# ************************************************************************
# * Carthage
# ************************************************************************
class Carthage_Talon(DealRowTalonStack):
def dealCards(self, sound=False):
if sound:

17
pysollib/games/auldlangsyne.py
View file

@ -21,31 +21,26 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.numerica import Numerica_Hint
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, QUEEN
from pysollib.stack import \
AbstractFoundationStack, \
BasicRowStack, \
DealRowTalonStack, \
OpenStack, \
OpenTalonStack, \
RK_FoundationStack, \
RedealTalonStack, \
ReserveStack, \
RK_FoundationStack, \
SS_FoundationStack, \
Stack, \
StackWrapper, \
WasteStack, \
WasteTalonStack
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.games.numerica import Numerica_Hint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, QUEEN
# ************************************************************************

23
pysollib/games/bakersdozen.py
View file

@ -21,12 +21,12 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, KING, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.stack import \
AC_FoundationStack, \
AC_RowStack, \
@ -34,16 +34,13 @@ from pysollib.stack import \
RK_RowStack, \
SS_FoundationStack, \
SS_RowStack, \
StackWrapper, \
SuperMoveAC_RowStack, \
TalonStack, \
UD_AC_RowStack, \
UD_SS_RowStack, \
StackWrapper
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.hint import FreeCellSolverWrapper
UD_SS_RowStack
from pysollib.util import ACE, KING, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
# ************************************************************************

20
pysollib/games/bakersgame.py
View file

@ -21,12 +21,12 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.util import KING
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.freecell import FreeCell
from pysollib.hint import DefaultHint
from pysollib.hint import FreeCellSolverWrapper, FreeCellType_Hint
from pysollib.layout import Layout
from pysollib.stack import \
AC_RowStack, \
FreeCell_SS_RowStack, \
@ -36,13 +36,9 @@ from pysollib.stack import \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
SuperMoveSS_RowStack, \
StackWrapper
from pysollib.layout import Layout
from pysollib.hint import DefaultHint
from pysollib.hint import FreeCellType_Hint, FreeCellSolverWrapper
from pysollib.games.freecell import FreeCell
StackWrapper, \
SuperMoveSS_RowStack
from pysollib.util import KING
# ************************************************************************
# * Baker's Game

31
pysollib/games/beleagueredcastle.py
View file

@ -21,39 +21,32 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, ANY_RANK, NO_RANK, KING, QUEEN, RANKS
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, FreeCellType_Hint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
InitialDealTalonStack, \
OpenStack, \
ReserveStack, \
RK_FoundationStack, \
RK_RowStack, \
Spider_SS_RowStack, \
ReserveStack, \
SS_FoundationStack, \
Spider_SS_RowStack, \
StackWrapper, \
SuperMoveRK_RowStack, \
TalonStack, \
UD_AC_RowStack, \
UD_RK_RowStack, \
UD_SS_RowStack, \
WasteStack, \
WasteTalonStack, \
StackWrapper
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint, FreeCellType_Hint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.pysoltk import MfxCanvasText
WasteTalonStack
from pysollib.util import ACE, ANY_RANK, KING, NO_RANK, QUEEN, RANKS
# ************************************************************************
# *
# ************************************************************************
class BeleagueredCastleType_Hint(CautiousDefaultHint):
# FIXME: demo is not too clever in this game
pass

19
pysollib/games/bisley.py
View file

@ -21,27 +21,24 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, NO_RANK, KING, RANKS, UNLIMITED_REDEALS
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
AC_RowStack, \
BasicRowStack, \
InitialDealTalonStack, \
ReserveStack, \
SS_FoundationStack, \
StackWrapper, \
UD_AC_RowStack, \
UD_RK_RowStack, \
UD_SS_RowStack, \
WasteStack, \
WasteTalonStack, \
StackWrapper
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
WasteTalonStack
from pysollib.util import ACE, KING, NO_RANK, RANKS, UNLIMITED_REDEALS
# ************************************************************************

26
pysollib/games/braid.py
View file

@ -21,13 +21,15 @@
#
# ---------------------------------------------------------------------------
# imports
import math
# PySol imports
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, NO_RANK, KING, RANKS, UNLIMITED_CARDS
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
AbstractFoundationStack, \
BasicRowStack, \
@ -36,19 +38,11 @@ from pysollib.stack import \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
WasteStack, \
WasteTalonStack, \
Stack, \
StackWrapper
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
# ************************************************************************
# *
# ************************************************************************
StackWrapper, \
WasteStack, \
WasteTalonStack
from pysollib.util import ACE, KING, NO_RANK, RANKS, UNLIMITED_CARDS
class Braid_Hint(DefaultHint):

25
pysollib/games/bristol.py
View file

@ -21,32 +21,25 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, ANY_RANK, NO_RANK, KING, RANKS, UNLIMITED_CARDS
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
AC_RowStack, \
KingAC_RowStack, \
OpenStack, \
OpenTalonStack, \
ReserveStack, \
RK_FoundationStack, \
RK_RowStack, \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
StackWrapper, \
TalonStack, \
WasteStack, \
StackWrapper
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
# ************************************************************************
# *
# ************************************************************************
WasteStack
from pysollib.util import ACE, ANY_RANK, KING, NO_RANK, RANKS, UNLIMITED_CARDS
class Bristol_Hint(CautiousDefaultHint):

15
pysollib/games/buffalobill.py
View file

@ -21,18 +21,15 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import KING
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.stack import \
BasicRowStack, \
InitialDealTalonStack, \
SS_FoundationStack, \
ReserveStack
from pysollib.game import Game
from pysollib.layout import Layout
ReserveStack, \
SS_FoundationStack
from pysollib.util import KING
# ************************************************************************
# * Buffalo Bill

19
pysollib/games/calculation.py
View file

@ -1,26 +1,19 @@
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint
from pysollib.pysoltk import MfxCanvasText, get_text_width
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.util import ANY_SUIT, KING, \
RANKS
from pysollib.pysoltk import MfxCanvasText, get_text_width
from pysollib.stack import \
BasicRowStack, \
DealRowTalonStack, \
InitialDealTalonStack, \
RK_FoundationStack, \
Stack, \
StackWrapper, \
WasteStack, \
WasteTalonStack, \
StackWrapper
# ************************************************************************
# *
# ************************************************************************
WasteTalonStack
from pysollib.util import ANY_SUIT, KING, RANKS
class Calculation_Hint(DefaultHint):

27
pysollib/games/camelot.py
View file

@ -21,22 +21,13 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.numerica import Numerica_Hint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, \
RANKS, QUEEN, \
UNLIMITED_CARDS
from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
AbstractFoundationStack, \
BasicRowStack, \
@ -45,10 +36,12 @@ from pysollib.stack import \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
StackWrapper, \
WasteStack, \
WasteTalonStack, \
StackWrapper
WasteTalonStack
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, \
QUEEN, RANKS, \
UNLIMITED_CARDS
# ************************************************************************
# * Camelot
# ************************************************************************

17
pysollib/games/canfield.py
View file

@ -1,12 +1,9 @@
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.mygettext import _
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.util import KING, RANKS, QUEEN, UNLIMITED_REDEALS
from pysollib.stack import \
AC_RowStack, \
KingAC_RowStack, \
@ -15,12 +12,10 @@ from pysollib.stack import \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
StackWrapper, \
WasteStack, \
WasteTalonStack, \
StackWrapper
# ************************************************************************
# *
# ************************************************************************
WasteTalonStack
from pysollib.util import KING, QUEEN, RANKS, UNLIMITED_REDEALS
class Canfield_Hint(CautiousDefaultHint):

20
pysollib/games/capricieuse.py
View file

@ -21,26 +21,20 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.gypsy import DieRussische_Foundation
from pysollib.util import ANY_SUIT, KING
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.stack import \
AC_RowStack, \
InitialDealTalonStack, \
RedealTalonStack, \
RK_FoundationStack, \
RedealTalonStack, \
SS_FoundationStack, \
UD_SS_RowStack, \
StackWrapper
StackWrapper, \
UD_SS_RowStack
from pysollib.util import ANY_SUIT, KING
# ************************************************************************

26
pysollib/games/curdsandwhey.py
View file

@ -21,36 +21,32 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
import pysollib.game
from pysollib.layout import Layout
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.stack import \
AbstractFoundationStack, \
AC_RowStack, \
AbstractFoundationStack, \
BasicRowStack, \
DealRowTalonStack, \
InitialDealTalonStack, \
isRankSequence, \
isSameSuitSequence, \
OpenStack, \
OpenTalonStack, \
RK_RowStack, \
SS_FoundationStack, \
SS_RowStack, \
StackWrapper, \
TalonStack, \
WasteStack, \
WasteTalonStack, \
StackWrapper
isRankSequence, \
isSameSuitSequence
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
# ************************************************************************
# * Curds and Whey

14
pysollib/games/daddylonglegs.py
View file

@ -1,21 +1,15 @@
# vim:ts=4:et:nowrap:fileencoding=utf-8
#
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.util import ACE
from pysollib.stack import \
DealRowTalonStack, \
StackWrapper, \
Yukon_SS_RowStack, \
isSameSuitSequence, \
StackWrapper
isSameSuitSequence
from pysollib.util import ACE
# ***********************************************************************
# Daddy Longlegs (by Jim Sizelove)

9
pysollib/games/dieboesesieben.py
View file

@ -21,16 +21,11 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.gypsy import \
DieKoenigsbergerin_Talon, DieRussische_Foundation
from pysollib.layout import Layout
from pysollib.stack import AC_RowStack
# ************************************************************************

16
pysollib/games/diplomat.py
View file

@ -21,27 +21,21 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.fortythieves import FortyThieves_Hint
from pysollib.games.spider import Spider_Hint
from pysollib.util import ACE, KING
from pysollib.layout import Layout
from pysollib.stack import \
RK_RowStack, \
SS_FoundationStack, \
SS_RowStack, \
Spider_SS_RowStack, \
StackWrapper, \
UD_SS_RowStack, \
WasteStack, \
WasteTalonStack, \
StackWrapper
WasteTalonStack
from pysollib.util import ACE, KING
# ************************************************************************
# * Diplomat

11
pysollib/games/doublets.py
View file

@ -21,21 +21,16 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ANY_SUIT, KING
from pysollib.layout import Layout
from pysollib.stack import \
AbstractFoundationStack, \
ReserveStack, \
WasteStack, \
WasteTalonStack
from pysollib.util import ANY_SUIT, KING
# ************************************************************************
# * Doublets

14
pysollib/games/eiffeltower.py
View file

@ -21,21 +21,15 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
import pysollib.game
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
# from pysollib.util import ACE
from pysollib.stack import \
OpenStack, \
StackWrapper, \
WasteStack, \
WasteTalonStack, \
StackWrapper
WasteTalonStack
# ************************************************************************
# * Eiffel Tower

21
pysollib/games/fan.py
View file

@ -21,19 +21,13 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ACE, KING, NO_RANK, UNLIMITED_CARDS
from pysollib.stack import \
AC_FoundationStack, \
AC_RowStack, \
@ -50,17 +44,14 @@ from pysollib.stack import \
SS_FoundationStack, \
SS_RowStack, \
Stack, \
StackWrapper, \
SuperMoveSS_RowStack, \
TalonStack, \
UD_RK_RowStack, \
UD_SS_RowStack, \
StackWrapper
UD_SS_RowStack
from pysollib.util import ACE, KING, NO_RANK, UNLIMITED_CARDS
# ************************************************************************
# *
# ************************************************************************
class Fan_Hint(CautiousDefaultHint):
# FIXME: demo is not too clever in this game
pass

24
pysollib/games/fortythieves.py
View file

@ -21,19 +21,11 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.gypsy import DieRussische_Foundation
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, \
UNLIMITED_MOVES, UNLIMITED_REDEALS
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout
from pysollib.stack import \
AC_FoundationStack, \
AC_RowStack, \
@ -45,17 +37,15 @@ from pysollib.stack import \
SS_RowStack, \
Spider_SS_RowStack, \
Stack, \
StackWrapper, \
TalonStack, \
UD_AC_RowStack, \
WasteStack, \
WasteTalonStack, \
StackWrapper
WasteTalonStack
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, \
UNLIMITED_MOVES, UNLIMITED_REDEALS
# ************************************************************************
# *
# ************************************************************************
class FortyThieves_Hint(CautiousDefaultHint):
# FIXME: demo is not too clever in this game
pass

22
pysollib/games/freecell.py
View file

@ -21,20 +21,13 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import DefaultHint
from pysollib.hint import FreeCellType_Hint, FreeCellSolverWrapper
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.spider import Spider_AC_Foundation
from pysollib.util import ACE, ANY_SUIT, KING, NO_RANK, UNLIMITED_CARDS
from pysollib.hint import DefaultHint
from pysollib.hint import FreeCellSolverWrapper, FreeCellType_Hint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.stack import \
AC_FoundationStack, \
AC_RowStack, \
@ -48,10 +41,11 @@ from pysollib.stack import \
ReserveStack, \
SS_FoundationStack, \
Stack, \
StackWrapper, \
SuperMoveAC_RowStack, \
SuperMoveRK_RowStack, \
isAlternateColorSequence, \
StackWrapper
isAlternateColorSequence
from pysollib.util import ACE, ANY_SUIT, KING, NO_RANK, UNLIMITED_CARDS
# ************************************************************************
# * FreeCell

16
pysollib/games/glenwood.py
View file

@ -21,19 +21,12 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.canfield import Canfield_Hint
from pysollib.util import ANY_RANK, RANKS
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
AC_RowStack, \
AbstractFoundationStack, \
@ -42,6 +35,7 @@ from pysollib.stack import \
SS_RowStack, \
WasteStack, \
WasteTalonStack
from pysollib.util import ANY_RANK, RANKS
# ************************************************************************
# * Glenwood

33
pysollib/games/golf.py
View file

@ -21,24 +21,16 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
import pysollib.game
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint
from pysollib.hint import BlackHoleSolverWrapper
from pysollib.pysoltk import MfxCanvasText
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.pileon import FourByFour_Hint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, RANKS, \
SUITS, \
UNLIMITED_REDEALS
from pysollib.hint import AbstractHint, CautiousDefaultHint, DefaultHint
from pysollib.hint import BlackHoleSolverWrapper
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
AbstractFoundationStack, \
BasicRowStack, \
@ -51,16 +43,15 @@ from pysollib.stack import \
SS_FoundationStack, \
SS_RowStack, \
Stack, \
StackWrapper, \
TalonStack, \
UD_RK_RowStack, \
WasteStack, \
WasteTalonStack, \
isSameSuitSequence, \
StackWrapper
# ************************************************************************
# *
# ************************************************************************
isSameSuitSequence
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, RANKS, \
SUITS, \
UNLIMITED_REDEALS
class Golf_Hint(AbstractHint):

9
pysollib/games/grandduchess.py
View file

@ -21,20 +21,15 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.util import ACE, KING
from pysollib.stack import \
ArbitraryStack, \
BasicRowStack, \
RedealTalonStack, \
SS_FoundationStack
from pysollib.util import ACE, KING
# ************************************************************************
# * Grand Duchess

15
pysollib/games/grandfathersclock.py
View file

@ -21,20 +21,10 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint
# ************************************************************************
# *
# ************************************************************************
from pysollib.util import ACE, ANY_SUIT, JACK, KING, QUEEN
from pysollib.stack import \
AC_FoundationStack, \
BasicRowStack, \
@ -47,6 +37,7 @@ from pysollib.stack import \
SS_RowStack, \
WasteStack, \
WasteTalonStack
from pysollib.util import ACE, ANY_SUIT, JACK, KING, QUEEN
class GrandfathersClock_Hint(CautiousDefaultHint):

26
pysollib/games/gypsy.py
View file

@ -21,21 +21,13 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.spider import Spider_Hint, Spider_RowStack, \
Spider_SS_Foundation
from pysollib.hint import KlondikeType_Hint, YukonType_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
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.stack import \
AC_RowStack, \
AbstractFoundationStack, \
@ -49,17 +41,19 @@ from pysollib.stack import \
SS_RowStack, \
Spider_SS_RowStack, \
Stack, \
StackWrapper, \
TalonStack, \
WasteStack, \
WasteTalonStack, \
Yukon_AC_RowStack, \
StackWrapper
Yukon_AC_RowStack
from pysollib.util import ACE, ANY_SUIT, KING, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
# ************************************************************************
# * Gypsy
# ************************************************************************
class Gypsy(Game):
Layout_Method = staticmethod(Layout.gypsyLayout)
Talon_Class = DealRowTalonStack

22
pysollib/games/harp.py
View file

@ -21,31 +21,25 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.spider import Spider_Hint
from pysollib.games.spider import Spider_RowStack, Spider_SS_Foundation
from pysollib.hint import CautiousDefaultHint
from pysollib.hint import KlondikeType_Hint
from pysollib.games.spider import Spider_RowStack, Spider_SS_Foundation, \
Spider_Hint
from pysollib.util import ACE, KING
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.stack import \
AC_RowStack, \
BO_RowStack, \
KingAC_RowStack, \
SS_FoundationStack, \
SS_RowStack, \
Spider_SS_RowStack, \
StackWrapper, \
WasteStack, \
WasteTalonStack, \
SS_RowStack
WasteTalonStack
from pysollib.util import ACE, KING
# ************************************************************************
# * Double Klondike (Klondike with 2 decks and 9 rows)

11
pysollib/games/headsandtails.py
View file

@ -21,22 +21,17 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.util import KING
from pysollib.layout import Layout
from pysollib.stack import \
AC_RowStack, \
InitialDealTalonStack, \
OpenStack, \
SS_FoundationStack, \
SS_RowStack
from pysollib.util import KING
# ************************************************************************
# * Heads and Tails

21
pysollib/games/katzenschwanz.py
View file

@ -21,21 +21,12 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import FreeCellType_Hint, CautiousDefaultHint
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, FreeCellType_Hint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.layout import Layout
from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, RANKS, \
QUEEN, \
UNLIMITED_ACCEPTS
from pysollib.stack import \
AC_RowStack, \
AbstractFoundationStack, \
@ -50,10 +41,8 @@ from pysollib.stack import \
TalonStack, \
WasteStack, \
WasteTalonStack
# ************************************************************************
# *
# ************************************************************************
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, \
QUEEN, RANKS, UNLIMITED_ACCEPTS
class DerKatzenschwanz_Hint(FreeCellType_Hint):

30
pysollib/games/klondike.py
View file

@ -21,24 +21,17 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault, Struct
from pysollib.game import Game
import pysollib.game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.hint import KlondikeType_Hint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.pysoltk import MfxCanvasText
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.canfield import CanfieldRush_Talon
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK
from pysollib.hint import CautiousDefaultHint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.hint import KlondikeType_Hint
from pysollib.layout import Layout
from pysollib.mfxutil import Struct, kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
AC_RowStack, \
BO_RowStack, \
@ -53,14 +46,15 @@ from pysollib.stack import \
ReserveStack, \
SC_RowStack, \
SS_FoundationStack, \
SS_RowStack, \
Stack, \
StackWrapper, \
SuperMoveAC_RowStack, \
UD_SS_RowStack, \
WasteStack, \
WasteTalonStack, \
isSameColorSequence, \
SS_RowStack
isSameColorSequence
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK
# ************************************************************************
# * Klondike

7
pysollib/games/labyrinth.py
View file

@ -21,15 +21,8 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
# from pysollib.gamedb import registerGame, GameInfo
from pysollib.game import Game
from pysollib.layout import Layout
# from pysollib.util import
from pysollib.stack import \
BasicRowStack, \
DealRowTalonStack, \

17
pysollib/games/larasgame.py
View file

@ -21,28 +21,17 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
# from pysollib.util import
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.stack import \
OpenStack, \
SS_FoundationStack, \
Stack, \
WasteTalonStack
# ************************************************************************
# *
# ************************************************************************
class LarasGame_Hint(CautiousDefaultHint):
pass

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

@ -21,29 +21,26 @@
#
# ---------------------------------------------------------------------------
# Imports
from six.moves import range
import re
import time
from gettext import ungettext
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault, Struct, Image
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint
from pysollib.settings import TOOLKIT, DEBUG
from pysollib.pysoltk import MfxCanvasText, MfxCanvasImage
from pysollib.pysoltk import bind, EVENT_HANDLED, ANCHOR_NW
from pysollib.layout import Layout
from pysollib.mfxutil import Image, Struct, kwdefault
from pysollib.mygettext import _
from pysollib.mygettext import ungettext
from pysollib.pysoltk import ANCHOR_NW, EVENT_HANDLED, bind
from pysollib.pysoltk import MfxCanvasImage, MfxCanvasText
from pysollib.pysoltk import MfxMessageDialog
from pysollib.util import ANY_SUIT, NO_RANK
from pysollib.settings import DEBUG, TOOLKIT
from pysollib.stack import \
InitialDealTalonStack, \
OpenStack
from pysollib.util import ANY_SUIT, NO_RANK
from six.moves import range
def factorial(x):

33
pysollib/games/mahjongg/shisensho.py
View file

@ -21,32 +21,23 @@
#
# ---------------------------------------------------------------------------
# Imports
from gettext import ungettext
from six.moves import range
from pysollib.settings import TOOLKIT
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.mahjongg.mahjongg import AbstractMahjonggGame, \
Mahjongg_RowStack, \
comp_cardset
from pysollib.hint import AbstractHint
from pysollib.pysoltk import MfxCanvasText, MfxCanvasLine
from pysollib.games.mahjongg.mahjongg import Mahjongg_RowStack, \
AbstractMahjonggGame, comp_cardset
from pysollib.util import ANY_SUIT
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.mygettext import ungettext
from pysollib.pysoltk import MfxCanvasLine, MfxCanvasText
from pysollib.settings import TOOLKIT
from pysollib.stack import \
AbstractFoundationStack, \
InitialDealTalonStack
from pysollib.util import ANY_SUIT
# ************************************************************************
# *
# ************************************************************************
from six.moves import range
class Shisen_Hint(AbstractHint):

17
pysollib/games/matriarchy.py
View file

@ -21,23 +21,18 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.util import KING, QUEEN, VARIABLE_REDEALS
from pysollib.stack import \
SS_RowStack, \
Stack, \
WasteStack, \
WasteTalonStack, \
SS_RowStack
WasteTalonStack
from pysollib.util import KING, QUEEN, VARIABLE_REDEALS
# ************************************************************************
# * Talon

11
pysollib/games/montana.py
View file

@ -21,16 +21,10 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint
from pysollib.util import ACE, NO_SUIT
from pysollib.layout import Layout
from pysollib.stack import \
BasicRowStack, \
InitialDealTalonStack, \
@ -40,6 +34,7 @@ from pysollib.stack import \
TalonStack, \
WasteStack, \
WasteTalonStack
from pysollib.util import ACE, NO_SUIT
# ************************************************************************
# *

15
pysollib/games/montecarlo.py
View file

@ -21,16 +21,10 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint
from pysollib.util import ANY_RANK, ANY_SUIT, KING, NO_RANK, UNLIMITED_REDEALS
from pysollib.layout import Layout
from pysollib.stack import \
AbstractFoundationStack, \
BasicRowStack, \
@ -38,9 +32,10 @@ from pysollib.stack import \
InitialDealTalonStack, \
OpenStack, \
ReserveStack, \
SS_FoundationStack, \
StackWrapper, \
TalonStack, \
SS_FoundationStack
TalonStack
from pysollib.util import ANY_RANK, ANY_SUIT, KING, NO_RANK, UNLIMITED_REDEALS
# ************************************************************************
# *

25
pysollib/games/napoleon.py
View file

@ -21,29 +21,24 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.braid import Braid_Foundation
from pysollib.util import ACE, KING, RANKS, UNLIMITED_CARDS
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
BasicRowStack, \
InitialDealTalonStack, \
ReserveStack, \
SS_FoundationStack, \
Stack, \
UD_SS_RowStack, \
StackWrapper
StackWrapper, \
UD_SS_RowStack
from pysollib.util import ACE, KING, RANKS, UNLIMITED_CARDS
# ************************************************************************
# * stacks

10
pysollib/games/needle.py
View file

@ -21,16 +21,10 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
# from pysollib.util import ANY_SUIT, KING
from pysollib.layout import Layout
from pysollib.stack import \
AC_RowStack, \
InitialDealTalonStack, \

20
pysollib/games/numerica.py
View file

@ -21,21 +21,14 @@
#
# ---------------------------------------------------------------------------
# imports
import time
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.mfxutil import kwdefault
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS
from pysollib.mygettext import _
from pysollib.stack import \
AC_RowStack, \
BasicRowStack, \
@ -52,10 +45,9 @@ from pysollib.stack import \
TalonStack, \
WasteStack, \
WasteTalonStack
# ************************************************************************
# *
# ************************************************************************
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS
class Numerica_Hint(DefaultHint):

15
pysollib/games/osmosis.py
View file

@ -21,25 +21,20 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.util import ANY_RANK, ANY_SUIT, UNLIMITED_REDEALS
from pysollib.mygettext import _
from pysollib.stack import \
AbstractFoundationStack, \
BasicRowStack, \
FullStackWrapper, \
InitialDealTalonStack, \
OpenStack, \
ReserveStack, \
WasteStack, \
WasteTalonStack, \
ReserveStack
WasteTalonStack
from pysollib.util import ANY_RANK, ANY_SUIT, UNLIMITED_REDEALS
# ************************************************************************
# * Osmosis

9
pysollib/games/parallels.py
View file

@ -21,19 +21,14 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.util import ACE, KING
from pysollib.stack import \
BasicRowStack, \
DealRowTalonStack, \
SS_FoundationStack
from pysollib.util import ACE, KING
# ************************************************************************
# * Parallels

12
pysollib/games/pasdedeux.py
View file

@ -21,24 +21,16 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint
from pysollib.layout import Layout
from pysollib.stack import \
InvisibleStack, \
ReserveStack, \
WasteStack, \
WasteTalonStack
# ************************************************************************
# *
# ************************************************************************
class PasDeDeux_Hint(AbstractHint):
# FIXME: this is very simple

11
pysollib/games/picturegallery.py
View file

@ -21,16 +21,10 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint
from pysollib.util import ACE, KING, QUEEN
from pysollib.layout import Layout
from pysollib.stack import \
BasicRowStack, \
DealRowTalonStack, \
@ -42,6 +36,7 @@ from pysollib.stack import \
StackWrapper, \
WasteStack, \
WasteTalonStack
from pysollib.util import ACE, KING, QUEEN
# ************************************************************************
# *

17
pysollib/games/pileon.py
View file

@ -21,32 +21,27 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, RANKS
from pysollib.stack import \
AC_RowStack, \
AbstractFoundationStack, \
DealRowTalonStack, \
InitialDealTalonStack, \
RK_RowStack, \
ReserveStack, \
Stack, \
UD_AC_RowStack, \
UD_RK_RowStack, \
WasteStack, \
WasteTalonStack, \
cardsFaceDown, \
isRankSequence, \
ReserveStack
isRankSequence
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, RANKS
# ************************************************************************
# * PileOn

19
pysollib/games/pushpin.py
View file

@ -21,25 +21,16 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint
from pysollib.util import ANY_RANK, ANY_SUIT
from pysollib.layout import Layout
from pysollib.stack import \
AbstractFoundationStack, \
DealRowTalonStack, \
Stack, \
ReserveStack
# ************************************************************************
# *
# ************************************************************************
ReserveStack, \
Stack
from pysollib.util import ANY_RANK, ANY_SUIT
class PushPin_Hint(AbstractHint):

17
pysollib/games/pyramid.py
View file

@ -21,18 +21,11 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint
from pysollib.layout import Layout
from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, QUEEN, \
UNLIMITED_CARDS, UNLIMITED_REDEALS
from pysollib.stack import \
AbstractFoundationStack, \
BasicRowStack, \
@ -41,13 +34,15 @@ from pysollib.stack import \
FaceUpWasteTalonStack, \
InitialDealTalonStack, \
OpenStack, \
ReserveStack, \
Stack, \
StackWrapper, \
TalonStack, \
WasteStack, \
WasteTalonStack, \
getNumberOfFreeStacks, \
ReserveStack
getNumberOfFreeStacks
from pysollib.util import ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, QUEEN, \
UNLIMITED_CARDS, UNLIMITED_REDEALS
# ************************************************************************

22
pysollib/games/royalcotillion.py
View file

@ -21,19 +21,12 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.unionsquare import UnionSquare_Foundation
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.stack import \
AC_FoundationStack, \
AC_RowStack, \
@ -45,6 +38,7 @@ from pysollib.stack import \
RK_FoundationStack, \
RK_RowStack, \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
Stack, \
StackWrapper, \
@ -52,14 +46,14 @@ from pysollib.stack import \
UD_SS_RowStack, \
WasteStack, \
WasteTalonStack, \
isSameSuitSequence, \
SS_FoundationStack
isSameSuitSequence
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK
# ************************************************************************
# * Royal Cotillion
# ************************************************************************
class RoyalCotillion_Foundation(SS_FoundationStack):
def getBottomImage(self):
if self.cap.base_rank == 1:

12
pysollib/games/royaleast.py
View file

@ -21,19 +21,15 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.stack import \
RK_RowStack, \
SS_FoundationStack, \
WasteStack, \
WasteTalonStack, \
SS_FoundationStack
WasteTalonStack
# ************************************************************************
# * Royal East

14
pysollib/games/sanibel.py
View file

@ -21,19 +21,15 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.layout import Layout
from pysollib.hint import Yukon_Hint
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.gypsy import Gypsy
from pysollib.hint import Yukon_Hint
from pysollib.layout import Layout
from pysollib.stack import \
Yukon_AC_RowStack, \
SS_FoundationStack, \
StackWrapper, \
WasteTalonStack, \
SS_FoundationStack
Yukon_AC_RowStack
# ************************************************************************
# * Sanibel

15
pysollib/games/siebenbisas.py
View file

@ -21,25 +21,20 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ACE, KING, QUEEN
from pysollib.layout import Layout
from pysollib.stack import \
BasicRowStack, \
InitialDealTalonStack, \
InvisibleStack, \
ReserveStack, \
SS_FoundationStack, \
Stack, \
getPileFromStacks, \
isSameSuitSequence, \
SS_FoundationStack
isSameSuitSequence
from pysollib.util import ACE, KING, QUEEN
# ************************************************************************
# *

15
pysollib/games/simplex.py
View file

@ -21,21 +21,16 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
import pysollib.game
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.util import ANY_RANK, ANY_SUIT
from pysollib.stack import \
AbstractFoundationStack, \
SequenceRowStack, \
WasteStack, \
WasteTalonStack, \
AbstractFoundationStack
WasteTalonStack
from pysollib.util import ANY_RANK, ANY_SUIT
# ************************************************************************
# * Simplex

12
pysollib/games/special/hanoi.py
View file

@ -21,18 +21,14 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.stack import \
BasicRowStack, \
InitialDealTalonStack, \
isRankSequence, \
BasicRowStack
isRankSequence
# ************************************************************************
# * Tower of Hanoy

10
pysollib/games/special/memory.py
View file

@ -21,17 +21,11 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
# from pysollib.util import ANY_SUIT
from pysollib.stack import \
InitialDealTalonStack, \
InvisibleStack, \

15
pysollib/games/special/pegged.py
View file

@ -21,25 +21,16 @@
#
# ---------------------------------------------------------------------------
# Imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint
from pysollib.util import ANY_SUIT
from pysollib.layout import Layout
from pysollib.stack import \
AbstractFoundationStack, \
InitialDealTalonStack, \
InvisibleStack, \
ReserveStack
# ************************************************************************
# *
# ************************************************************************
from pysollib.util import ANY_SUIT
class Pegged_Hint(AbstractHint):

8
pysollib/games/special/poker.py
View file

@ -21,15 +21,11 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
InitialDealTalonStack, \
InvisibleStack, \

28
pysollib/games/special/tarock.py
View file

@ -21,33 +21,27 @@
#
# ---------------------------------------------------------------------------##
# Imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.braid import Braid_Foundation, Braid_BraidStack, \
Braid_RowStack, Braid_ReserveStack, Braid
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.bakersdozen import Cruel_Talon
from pysollib.util import ANY_RANK, NO_RANK, UNLIMITED_ACCEPTS, UNLIMITED_MOVES
from pysollib.games.braid import Braid, Braid_ReserveStack, Braid_RowStack
from pysollib.games.braid import Braid_BraidStack, Braid_Foundation
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
InitialDealTalonStack, \
OpenStack, \
RK_RowStack, \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
StackWrapper, \
WasteStack, \
WasteTalonStack, \
SS_RowStack
WasteTalonStack
from pysollib.util import ANY_RANK, NO_RANK, UNLIMITED_ACCEPTS, UNLIMITED_MOVES
# ************************************************************************
# * Tarock Talon Stacks

25
pysollib/games/spider.py
View file

@ -21,22 +21,15 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
import pysollib.game
from pysollib.layout import Layout
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.hint import SpiderType_Hint, YukonType_Hint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, \
UNLIMITED_ACCEPTS, UNLIMITED_CARDS, UNLIMITED_MOVES
from pysollib.hint import SpiderType_Hint, YukonType_Hint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.stack import \
AC_FoundationStack, \
AC_RowStack, \
@ -48,6 +41,7 @@ from pysollib.stack import \
OpenStack, \
RK_RowStack, \
ReserveStack, \
SS_FoundationStack, \
Spider_AC_Foundation, \
Spider_SS_Foundation, \
Spider_SS_RowStack, \
@ -62,8 +56,9 @@ from pysollib.stack import \
isAlternateColorSequence, \
isRankSequence, \
isSameColorSequence, \
isSameSuitSequence, \
SS_FoundationStack
isSameSuitSequence
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, \
UNLIMITED_ACCEPTS, UNLIMITED_CARDS, UNLIMITED_MOVES
# ************************************************************************

19
pysollib/games/sthelena.py
View file

@ -21,31 +21,22 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ACE, JACK, KING, NO_RANK
from pysollib.layout import Layout
from pysollib.stack import \
DealRowTalonStack, \
InitialDealTalonStack, \
RedealTalonStack, \
SS_FoundationStack, \
StackWrapper, \
TalonStack, \
UD_RK_RowStack, \
UD_SS_RowStack, \
SS_FoundationStack
UD_SS_RowStack
from pysollib.util import ACE, JACK, KING, NO_RANK
# ************************************************************************
# *
# ************************************************************************
class StHelena_Talon(TalonStack):
def canDealCards(self):

17
pysollib/games/sultan.py
View file

@ -21,17 +21,10 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ACE, ANY_SUIT, JACK, KING, NO_RANK, QUEEN, \
UNLIMITED_REDEALS
from pysollib.layout import Layout
from pysollib.stack import \
AC_FoundationStack, \
AbstractFoundationStack, \
@ -44,6 +37,7 @@ from pysollib.stack import \
RK_FoundationStack, \
RK_RowStack, \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
Stack, \
StackWrapper, \
@ -51,8 +45,9 @@ from pysollib.stack import \
UD_AC_RowStack, \
UD_SS_RowStack, \
WasteStack, \
WasteTalonStack, \
SS_FoundationStack
WasteTalonStack
from pysollib.util import ACE, ANY_SUIT, JACK, KING, NO_RANK, QUEEN, \
UNLIMITED_REDEALS
# ************************************************************************

17
pysollib/games/takeaway.py
View file

@ -21,16 +21,10 @@
#
# ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.util import ANY_RANK, ANY_SUIT, JACK, KING, QUEEN
from pysollib.mygettext import _
from pysollib.stack import \
AC_RowStack, \
AbstractFoundationStack, \
@ -38,15 +32,16 @@ from pysollib.stack import \
InitialDealTalonStack, \
OpenStack, \
Stack, \
StackWrapper, \
UD_RK_RowStack, \
isAlternateColorSequence, \
StackWrapper
isAlternateColorSequence
from pysollib.util import ANY_RANK, ANY_SUIT, JACK, KING, QUEEN
# ************************************************************************
# * Take Away
# ************************************************************************
class TakeAway_Foundation(AbstractFoundationStack):
def acceptsCards(self, from_stack, cards):

17
pysollib/games/terrace.py
View file

@ -21,16 +21,12 @@
#
# ---------------------------------------------------------------------------
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.util import KING, NO_RANK
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.stack import \
AC_FoundationStack, \
AC_RowStack, \
@ -40,10 +36,7 @@ from pysollib.stack import \
StackWrapper, \
WasteStack, \
WasteTalonStack
# ************************************************************************
# *
# ************************************************************************
from pysollib.util import KING, NO_RANK
class Terrace_Talon(WasteTalonStack):

19
pysollib/games/threepeaks.py
View file

@ -21,25 +21,16 @@
#
# ---------------------------------------------------------------------------##
# Imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.golf import Golf_Hint, Golf_Waste
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.golf import Golf_Waste, Golf_Hint
from pysollib.stack import OpenStack, StackWrapper, WasteTalonStack
from pysollib.util import ANY_RANK
from pysollib.stack import \
OpenStack, \
StackWrapper, \
WasteTalonStack
# ************************************************************************
# * Three Peaks Row Stack
# ************************************************************************

17
pysollib/games/tournament.py
View file

@ -21,17 +21,11 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ACE, JACK, KING, QUEEN
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.stack import \
AC_RowStack, \
BasicRowStack, \
@ -39,9 +33,10 @@ from pysollib.stack import \
DealRowTalonStack, \
OpenStack, \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
Stack, \
SS_FoundationStack
Stack
from pysollib.util import ACE, JACK, KING, QUEEN
# ************************************************************************
# * Tournament

25
pysollib/games/ultra/dashavatara.py
View file

@ -21,25 +21,16 @@
#
# ---------------------------------------------------------------------------
# Imports
import math
import time
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint, CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout
from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS, \
UNLIMITED_MOVES
from pysollib.stack import \
AC_RowStack, \
AbstractFoundationStack, \
@ -53,8 +44,12 @@ from pysollib.stack import \
SS_RowStack, \
StackWrapper, \
WasteStack, \
isSameSuitSequence, \
WasteTalonStack
WasteTalonStack, \
isSameSuitSequence
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS, \
UNLIMITED_MOVES
# ************************************************************************
# * Dashavatara Foundation Stacks

28
pysollib/games/ultra/hanafuda.py
View file

@ -21,17 +21,9 @@
#
# ---------------------------------------------------------------------------##
# Imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.layout import Layout
from pysollib.hint import FreeCellType_Hint
from pysollib.pysoltk import MfxCanvasText
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.ultra.hanafuda_common import \
AbstractFlowerGame, \
FlowerClock_Foundation, \
FlowerClock_RowStack, \
FourWinds_Foundation, \
@ -45,18 +37,20 @@ from pysollib.games.ultra.hanafuda_common import \
MatsuKiri_Foundation, \
Matsukiri_RowStack, \
Oonsoo_SequenceStack, \
Pagoda_Foundation, \
AbstractFlowerGame
from pysollib.util import ANY_RANK, ANY_SUIT
Pagoda_Foundation
from pysollib.hint import FreeCellType_Hint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
DealRowTalonStack, \
InitialDealTalonStack, \
ReserveStack, \
WasteStack, \
cardsFaceUp, \
WasteTalonStack
WasteTalonStack, \
cardsFaceUp
from pysollib.util import ANY_RANK, ANY_SUIT
# ************************************************************************
# * Flower Clock

24
pysollib/games/ultra/hanafuda1.py
View file

@ -21,18 +21,12 @@
#
# ---------------------------------------------------------------------------##
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.ultra.hanafuda_common import \
Flower_OpenStack, \
AbstractFlowerGame, \
FlowerClock_RowStack, \
Flower_OpenStack, \
HanafudaRK_RowStack, \
Hanafuda_SS_FoundationStack, \
Hanafuda_SequenceStack, \
@ -42,11 +36,12 @@ from pysollib.games.ultra.hanafuda_common import \
Queue_Hint, \
Queue_ReserveStack, \
Queue_RowStack, \
Samuri_RowStack, \
AbstractFlowerGame
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK
Samuri_RowStack
from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
BasicRowStack, \
DealRowTalonStack, \
@ -56,6 +51,7 @@ from pysollib.stack import \
StackWrapper, \
WasteStack, \
WasteTalonStack
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK
# ************************************************************************

16
pysollib/games/ultra/hanafuda_common.py
View file

@ -23,23 +23,17 @@
import math
from pysollib.mygettext import _
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.hint import DefaultHint
from pysollib.util import ANY_RANK, ANY_SUIT
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.stack import \
AbstractFoundationStack, \
OpenStack, \
ReserveStack, \
isRankSequence, \
cardsFaceUp
# ************************************************************************
# *
# ***********************************************************************/
cardsFaceUp, \
isRankSequence
from pysollib.util import ANY_RANK, ANY_SUIT
class AbstractFlowerGame(Game):

21
pysollib/games/ultra/hexadeck.py
View file

@ -24,34 +24,31 @@
# Imports
import math
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
from pysollib.stack import \
AC_RowStack, \
AbstractFoundationStack, \
InitialDealTalonStack, \
OpenStack, \
ReserveStack, \
SS_FoundationStack, \
StackWrapper, \
WasteStack, \
WasteTalonStack, \
OpenStack
WasteTalonStack
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
# ************************************************************************
# * Hex A Deck Foundation Stacks
# ************************************************************************
class HexADeck_FoundationStack(SS_FoundationStack):
def __init__(self, x, y, game, suit, **cap):
kwdefault(cap, max_move=0, max_cards=12)

17
pysollib/games/ultra/larasgame.py
View file

@ -21,19 +21,10 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.games.larasgame import LarasGame_Talon, LarasGame, \
LarasGame_Reserve
from pysollib.stack import \
OpenStack
# ************************************************************************
# *
# ************************************************************************
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.larasgame import LarasGame, LarasGame_Reserve
from pysollib.games.larasgame import LarasGame_Talon
from pysollib.stack import OpenStack
class DojoujisGame_Talon(LarasGame_Talon):

10
pysollib/games/ultra/matrix.py
View file

@ -21,21 +21,17 @@
#
# ---------------------------------------------------------------------------##
# Imports
import math
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.pysoltk import bind
from pysollib.util import ANY_RANK
from pysollib.stack import \
InitialDealTalonStack, \
OpenStack
from pysollib.util import ANY_RANK
# ************************************************************************
# * Matrix Row Stack

21
pysollib/games/ultra/mughal.py
View file

@ -21,27 +21,22 @@
#
# ---------------------------------------------------------------------------##
# Imports
import math
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint, DefaultHint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS, UNLIMITED_MOVES
from pysollib.stack import \
AC_RowStack, \
AbstractFoundationStack, \
BasicRowStack, \
DealRowTalonStack, \
InitialDealTalonStack, \
OpenStack, \
RK_RowStack, \
ReserveStack, \
SS_FoundationStack, \
@ -49,8 +44,10 @@ from pysollib.stack import \
StackWrapper, \
WasteStack, \
WasteTalonStack, \
isSameSuitSequence, \
OpenStack
isSameSuitSequence
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS, UNLIMITED_MOVES
# ************************************************************************
# * Mughal Foundation Stacks

22
pysollib/games/ultra/tarock.py
View file

@ -21,28 +21,18 @@
#
# ---------------------------------------------------------------------------##
# Imports
# Ultrasol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.layout import Layout
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.special.tarock import AbstractTarockGame, Grasshopper
from pysollib.games.threepeaks import ThreePeaksNoScore
from pysollib.util import ANY_RANK, NO_RANK, UNLIMITED_ACCEPTS, UNLIMITED_MOVES
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.stack import \
InitialDealTalonStack, \
OpenStack, \
ReserveStack, \
SS_FoundationStack, \
StackWrapper, \
OpenStack
# ************************************************************************
# *
# ************************************************************************
StackWrapper
from pysollib.util import ANY_RANK, NO_RANK, UNLIMITED_ACCEPTS, UNLIMITED_MOVES
class Tarock_OpenStack(OpenStack):

19
pysollib/games/unionsquare.py
View file

@ -21,26 +21,21 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
import pysollib.game
from pysollib.layout import Layout
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ACE, ANY_RANK, NO_RANK
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.stack import \
AbstractFoundationStack, \
OpenStack, \
Stack, \
StackWrapper, \
UD_SS_RowStack, \
WasteStack, \
WasteTalonStack, \
StackWrapper
WasteTalonStack
from pysollib.util import ACE, ANY_RANK, NO_RANK
# ************************************************************************

13
pysollib/games/wavemotion.py
View file

@ -21,22 +21,17 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.util import ANY_RANK
from pysollib.stack import \
AC_RowStack, \
InitialDealTalonStack, \
OpenStack, \
SS_RowStack, \
isAlternateColorSequence, \
isSameSuitSequence, \
SS_RowStack
isSameSuitSequence
from pysollib.util import ANY_RANK
# ************************************************************************
# * Wave Motion

20
pysollib/games/windmill.py
View file

@ -21,19 +21,12 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
import pysollib.game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.golf import BlackHole_Foundation
from pysollib.util import ACE, ANY_SUIT, KING, UNLIMITED_CARDS
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.stack import \
AC_RowStack, \
RK_FoundationStack, \
@ -41,10 +34,11 @@ from pysollib.stack import \
ReserveStack, \
SS_FoundationStack, \
Stack, \
StackWrapper, \
UD_RK_RowStack, \
WasteStack, \
WasteTalonStack, \
StackWrapper
WasteTalonStack
from pysollib.util import ACE, ANY_SUIT, KING, UNLIMITED_CARDS
# ************************************************************************
# *

27
pysollib/games/yukon.py
View file

@ -21,13 +21,14 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ANY_SUIT, KING
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.spider import Spider_SS_Foundation
from pysollib.hint import Yukon_Hint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \
DealRowTalonStack, \
InitialDealTalonStack, \
@ -36,17 +37,11 @@ from pysollib.stack import \
ReserveStack, \
SS_FoundationStack, \
StackWrapper, \
Yukon_AC_RowStack, \
Yukon_SS_RowStack, \
WasteStack, \
WasteTalonStack
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import Yukon_Hint
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.spider import Spider_SS_Foundation
WasteTalonStack, \
Yukon_AC_RowStack, \
Yukon_SS_RowStack
from pysollib.util import ANY_SUIT, KING
# ************************************************************************

11
pysollib/games/zodiac.py
View file

@ -21,11 +21,9 @@
#
# ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import KING, NO_RANK, UNLIMITED_REDEALS
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.stack import \
OpenStack, \
ReserveStack, \
@ -34,8 +32,7 @@ from pysollib.stack import \
UD_SS_RowStack, \
WasteStack, \
WasteTalonStack
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.util import KING, NO_RANK, UNLIMITED_REDEALS
# ************************************************************************

6
pysollib/help.py
View file

@ -26,11 +26,11 @@
# PySol imports
from pysollib.mygettext import _
from pysollib.settings import TITLE, PACKAGE_URL, TOOLKIT, VERSION
from pysollib.pysoltk import make_help_toplevel
from pysollib.pysoltk import HTMLViewer
from pysollib.pysoltk import MfxMessageDialog
from pysollib.pysoltk import PysolAboutDialog
from pysollib.pysoltk import HTMLViewer
from pysollib.pysoltk import make_help_toplevel
from pysollib.settings import PACKAGE_URL, TITLE, TOOLKIT, VERSION
# ************************************************************************

11
pysollib/hint.py
View file

@ -24,18 +24,19 @@
# imports
import os
import time
import subprocess
import re
import six
import subprocess
import time
from io import BytesIO
# PySol imports
from pysollib.settings import DEBUG, FCS_COMMAND
from pysollib.pysolrandom import constructRandom
from pysollib.mfxutil import destruct
from pysollib.pysolrandom import constructRandom
from pysollib.settings import DEBUG, FCS_COMMAND
from pysollib.util import KING
import six
FCS_VERSION = None
# ************************************************************************

3
pysollib/htmllib2.py
View file

@ -4,9 +4,10 @@ See the HTML 2.0 specification:
http://www.w3.org/hypertext/WWW/MarkUp/html-spec/html-spec_toc.html
"""
from six.moves import html_parser
from formatter import AS_IS
from six.moves import html_parser
class HTMLParseError(RuntimeError):
"""Error raised when an HTML document can't be parsed."""

14
pysollib/images.py
View file

@ -22,19 +22,13 @@
# ---------------------------------------------------------------------------##
# imports
import os
# settings
from pysollib.settings import TOOLKIT
# PySol imports
from pysollib.resource import CSI
from pysollib.mfxutil import Image, ImageTk, USE_PIL
# Toolkit imports
from pysollib.pysoltk import loadImage, copyImage, createImage, \
shadowImage, createBottom
from pysollib.pysoltk import copyImage, createBottom, createImage, loadImage
from pysollib.pysoltk import shadowImage
from pysollib.resource import CSI
from pysollib.settings import TOOLKIT
# ************************************************************************
# * Images

10
pysollib/init.py
View file

@ -21,12 +21,12 @@
#
# ---------------------------------------------------------------------------##
import sys
import os
import locale
import subprocess
import gettext
import locale
import os
import subprocess
import sys
import pysollib.settings
# ************************************************************************

42
pysollib/kivy/LApp.py
View file

@ -25,38 +25,32 @@ import logging
import math
import traceback
from kivy.graphics import Color
from kivy.graphics import Rectangle
from kivy.graphics import Line
from kivy.graphics import Triangle
from kivy.utils import platform
from kivy.properties import StringProperty
from kivy.animation import Animation
from kivy.app import App
from kivy.base import EventLoop
from kivy.base import stopTouchApp
from kivy.app import App
from kivy.animation import Animation
from kivy.core.audio import SoundLoader
from kivy.cache import Cache
from kivy.clock import Clock
from kivy.uix.image import Image as KivyImage
from kivy.uix.boxlayout import BoxLayout
from kivy.uix.widget import Widget
from kivy.uix.button import Button
from kivy.core.audio import SoundLoader
from kivy.core.window import Window
from kivy.graphics import Color
from kivy.graphics import Line
from kivy.graphics import Rectangle
from kivy.graphics import Triangle
from kivy.properties import StringProperty
from kivy.uix.actionbar import ActionButton
from kivy.uix.actionbar import ActionPrevious
from kivy.uix.actionbar import ActionView
from kivy.uix.behaviors import ButtonBehavior
from kivy.uix.boxlayout import BoxLayout
from kivy.uix.button import Button
from kivy.uix.image import Image as KivyImage
from kivy.uix.label import Label
from kivy.uix.scrollview import ScrollView
from kivy.uix.actionbar import ActionView
from kivy.uix.actionbar import ActionPrevious
from kivy.uix.actionbar import ActionButton
from kivy.uix.treeview import TreeView
from kivy.uix.treeview import TreeViewLabel
from kivy.core.window import Window
from kivy.cache import Cache
from kivy.uix.widget import Widget
from kivy.utils import platform
# =============================================================================

13
pysollib/kivy/card.py
View file

@ -21,19 +21,10 @@
#
# ---------------------------------------------------------------------------#
# PySol imports
from pysollib.acard import AbstractCard
# Toolkit imports
from pysollib.kivy.tkcanvas import MfxCanvasGroup, MfxCanvasImage
# from tkutil import Image
from pysollib.kivy.LApp import LImageItem
from pysollib.kivy.LApp import LImage
# ************************************************************************
# *
# ************************************************************************
from pysollib.kivy.LApp import LImageItem
from pysollib.kivy.tkcanvas import MfxCanvasGroup, MfxCanvasImage
class _HideableCard(AbstractCard):

Some files were not shown because too many files have changed in this diff Show more