From 55cc8995aef8eb82accd0d852ef5aeb099da04e4 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sun, 25 Nov 2012 19:12:33 +0200 Subject: [PATCH] pysoltk. --- pysollib/actions.py | 30 +++++++++++------------ pysollib/app.py | 20 +++++++-------- pysollib/game.py | 18 +++++++------- pysollib/help.py | 8 +++--- pysollib/images.py | 2 +- pysollib/layout.py | 2 +- pysollib/main.py | 8 +++--- pysollib/options.py | 2 +- pysollib/stack.py | 16 ++++++------ scripts/gen_individual_importing_tests.py | 2 +- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/pysollib/actions.py b/pysollib/actions.py index 96d34b45..65b77023 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -37,23 +37,23 @@ from pysollib.gamedb import GI # stats imports from pysollib.stats import FileStatsFormatter -from pysoltk import SingleGame_StatsDialog, AllGames_StatsDialog -from pysoltk import FullLog_StatsDialog, SessionLog_StatsDialog -from pysoltk import Status_StatsDialog, Top_StatsDialog -from pysoltk import ProgressionDialog -from pysoltk import GameInfoDialog +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 pysoltk import MfxMessageDialog, MfxSimpleEntry -from pysoltk import MfxExceptionDialog -from pysoltk import PlayerOptionsDialog -from pysoltk import TimeoutsDialog -from pysoltk import ColorsDialog -from pysoltk import FontsDialog -from pysoltk import EditTextDialog -from pysoltk import create_find_card_dialog -from pysoltk import create_solver_dialog -from pysoltk import PysolMenubarTk, PysolToolbarTk +from pysollib.pysoltk import MfxMessageDialog, MfxSimpleEntry +from pysollib.pysoltk import MfxExceptionDialog +from pysollib.pysoltk import PlayerOptionsDialog +from pysollib.pysoltk import TimeoutsDialog +from pysollib.pysoltk import ColorsDialog +from pysollib.pysoltk import FontsDialog +from pysollib.pysoltk import EditTextDialog +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 diff --git a/pysollib/app.py b/pysollib/app.py index ce6a3d64..0dc2270d 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -47,16 +47,16 @@ from pysollib.settings import DEBUG from winsystems import TkSettings # Toolkit imports -from pysoltk import wm_withdraw, loadImage -from pysoltk import MfxDialog, MfxMessageDialog, MfxExceptionDialog -from pysoltk import TclError, MfxScrolledCanvas -from pysoltk import PysolProgressBar -from pysoltk import PysolStatusbar, HelpStatusbar -from pysoltk import SelectCardsetDialogWithPreview -from pysoltk import SelectDialogTreeData -from pysoltk import HTMLViewer -from pysoltk import destroy_find_card_dialog -from pysoltk import destroy_solver_dialog +from pysollib.pysoltk import wm_withdraw, loadImage +from pysollib.pysoltk import MfxDialog, MfxMessageDialog, MfxExceptionDialog +from pysollib.pysoltk import TclError, MfxScrolledCanvas +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 destroy_solver_dialog from pysollib.actions import PysolMenubar from pysollib.actions import PysolToolbar diff --git a/pysollib/game.py b/pysollib/game.py index e284b975..bd0e57a3 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -43,14 +43,14 @@ from pysollib.settings import VERSION, VERSION_TUPLE from pysollib.settings import DEBUG from pysollib.gamedb import GI from pysollib.pysolrandom import PysolRandom, LCRandom31 -from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE -from pysoltk import CURSOR_WATCH -from pysoltk import bind, wm_map -from pysoltk import after, after_idle, after_cancel -from pysoltk import MfxMessageDialog, MfxExceptionDialog -from pysoltk import MfxCanvasText, MfxCanvasLine, MfxCanvasRectangle -from pysoltk import Card -from pysoltk import reset_solver_dialog +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 +from pysollib.pysoltk import reset_solver_dialog from pysollib.move import AMoveMove, AFlipMove, AFlipAndMoveMove from pysollib.move import ASingleFlipMove, ATurnStackMove from pysollib.move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove @@ -3306,7 +3306,7 @@ in the current implementation.''') % version) # def showStackDesc(self): - from pysoltk import StackDesc + from pysollib.pysoltk import StackDesc from pysollib.stack import InitialDealTalonStack sd_list = [] for s in self.allstacks: diff --git a/pysollib/help.py b/pysollib/help.py index dbb0335e..148b4c15 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -26,10 +26,10 @@ # PySol imports from pysollib.settings import TITLE, PACKAGE_URL, TOOLKIT, VERSION -from pysoltk import make_help_toplevel -from pysoltk import MfxMessageDialog -from pysoltk import PysolAboutDialog -from pysoltk import HTMLViewer +from pysollib.pysoltk import make_help_toplevel +from pysollib.pysoltk import MfxMessageDialog +from pysollib.pysoltk import PysolAboutDialog +from pysollib.pysoltk import HTMLViewer # ************************************************************************ diff --git a/pysollib/images.py b/pysollib/images.py index 943a502a..622ac9bc 100644 --- a/pysollib/images.py +++ b/pysollib/images.py @@ -32,7 +32,7 @@ from pysollib.settings import TOOLKIT from pysollib.mfxutil import Image, ImageTk, USE_PIL # Toolkit imports -from pysoltk import loadImage, copyImage, createImage, shadowImage, createBottom, resizeBottom +from pysollib.pysoltk import loadImage, copyImage, createImage, shadowImage, createBottom, resizeBottom # ************************************************************************ diff --git a/pysollib/layout.py b/pysollib/layout.py index 6ba13ee0..f8a8459d 100644 --- a/pysollib/layout.py +++ b/pysollib/layout.py @@ -26,7 +26,7 @@ # PySol imports from pysollib.mfxutil import Struct -from pysoltk import MfxCanvasText +from pysollib.pysoltk import MfxCanvasText from pysollib.resource import CSI diff --git a/pysollib/main.py b/pysollib/main.py index a5fa1e99..dd4172cf 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -39,10 +39,10 @@ from pysollib.settings import TITLE, SOUND_MOD from winsystems import init_root_window # Toolkit imports -from pysoltk import loadImage -from pysoltk import MfxMessageDialog -from pysoltk import MfxRoot -from pysoltk import PysolProgressBar +from pysollib.pysoltk import loadImage +from pysollib.pysoltk import MfxMessageDialog +from pysollib.pysoltk import MfxRoot +from pysollib.pysoltk import PysolProgressBar # ************************************************************************ diff --git a/pysollib/options.py b/pysollib/options.py index 3f675cb7..4c426114 100644 --- a/pysollib/options.py +++ b/pysollib/options.py @@ -32,7 +32,7 @@ from pysollib.configobj import configobj, validate import pysollib.settings # Toolkit imports -from pysoltk import TOOLBAR_BUTTONS +from pysollib.pysoltk import TOOLBAR_BUTTONS # ************************************************************************ diff --git a/pysollib/stack.py b/pysollib/stack.py index 71822abd..8904fc6a 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -101,14 +101,14 @@ from pysollib.mfxutil import Struct, kwdefault, SubclassResponsibility from pysollib.mfxutil import Image, ImageTk, USE_PIL from pysollib.util import ACE, KING from pysollib.util import ANY_SUIT, ANY_COLOR, ANY_RANK, NO_RANK -from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE -from pysoltk import CURSOR_DRAG, CURSOR_DOWN_ARROW -from pysoltk import ANCHOR_NW, ANCHOR_SE -from pysoltk import bind, unbind_destroy -from pysoltk import after, after_idle, after_cancel -from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText, MfxCanvasLine -from pysoltk import get_text_width -from pysoltk import markImage +from pysollib.pysoltk import EVENT_HANDLED, EVENT_PROPAGATE +from pysollib.pysoltk import CURSOR_DRAG, CURSOR_DOWN_ARROW +from pysollib.pysoltk import ANCHOR_NW, ANCHOR_SE +from pysollib.pysoltk import bind, unbind_destroy +from pysollib.pysoltk import after, after_idle, after_cancel +from pysollib.pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText, MfxCanvasLine +from pysollib.pysoltk import get_text_width +from pysollib.pysoltk import markImage from pysollib.settings import TOOLKIT from pysollib.settings import DEBUG diff --git a/scripts/gen_individual_importing_tests.py b/scripts/gen_individual_importing_tests.py index bc491cd0..a3e23b0a 100644 --- a/scripts/gen_individual_importing_tests.py +++ b/scripts/gen_individual_importing_tests.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import os.path -for module_name in ['pysollib.app', 'pysollib.acard', 'pysollib.actions', 'pysollib.customgame', 'pysollib.help', 'pysollib.hint', 'pysollib.images', 'pysollib.main', 'pysollib.layout', 'pysollib.mfxutil', 'pysollib.move', 'pysollib.options', 'pysollib.pysolrandom', 'pysollib.resource', 'pysollib.settings', 'pysollib.stack', 'pysollib.stats', 'pysollib.mygettext', 'pysollib.wizardpresets', 'pysollib.util', 'pysollib.gamedb', 'pysollib.configobj.configobj', 'pysollib.configobj.validate', 'pysollib.game', ]: +for module_name in ['pysollib.app', 'pysollib.acard', 'pysollib.actions', 'pysollib.customgame', 'pysollib.help', 'pysollib.hint', 'pysollib.images', 'pysollib.main', 'pysollib.layout', 'pysollib.mfxutil', 'pysollib.move', 'pysollib.options', 'pysollib.pysolrandom', 'pysollib.resource', 'pysollib.settings', 'pysollib.stack', 'pysollib.stats', 'pysollib.mygettext', 'pysollib.wizardpresets', 'pysollib.util', 'pysollib.gamedb', 'pysollib.configobj.configobj', 'pysollib.configobj.validate', 'pysollib.game', 'pysollib.pysoltk', ]: open(os.path.join(".", "tests", "individually-importing", "import_" + module_name + ".py"), 'w').write('''#!/usr/bin/env python import sys sys.path.append("./tests/lib")