diff --git a/pysollib/actions.py b/pysollib/actions.py index 094e0446..96d34b45 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -54,7 +54,7 @@ from pysoltk import EditTextDialog from pysoltk import create_find_card_dialog from pysoltk import create_solver_dialog from pysoltk import PysolMenubarTk, PysolToolbarTk -from help import help_about, help_html +from pysollib.help import help_about, help_html # ************************************************************************ diff --git a/pysollib/app.py b/pysollib/app.py index d496722d..432f0960 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -60,7 +60,7 @@ from pysoltk import destroy_solver_dialog from pysollib.actions import PysolMenubar from pysollib.actions import PysolToolbar -from help import help_about, destroy_help_html +from pysollib.help import help_about, destroy_help_html # ************************************************************************ diff --git a/pysollib/game.py b/pysollib/game.py index bd180f58..e284b975 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -57,7 +57,7 @@ from pysollib.move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove from pysollib.move import AUpdateStackMove, AFlipAllMove, ASaveStateMove from pysollib.move import ASingleCardMove from pysollib.hint import DefaultHint -from help import help_about +from pysollib.help import help_about PLAY_TIME_TIMEOUT = 200 diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index f9bfa4e0..55b530a4 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -31,7 +31,6 @@ from UserList import UserList from pysollib.mfxutil import destruct, Struct, KwStruct from pysollib.mfxutil import format_time from pysollib.gamedb import GI -from pysollib.help import help_html from pysollib.resource import CSI # Toolkit imports @@ -309,6 +308,7 @@ class SelectGameDialog(MfxDialog): if not doc: return dir = os.path.join("html", "rules") + from pysollib.help import help_html help_html(self.app, doc, dir, self.top) return MfxDialog.mDone(self, button) diff --git a/scripts/gen_individual_importing_tests.py b/scripts/gen_individual_importing_tests.py index a46e90f3..cc96c9d3 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.hint', '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.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', ]: open(os.path.join(".", "tests", "individually-importing", "import_" + module_name + ".py"), 'w').write('''#!/usr/bin/env python import sys sys.path.append("./tests/lib")