gamedb.

pysollib/actions.py

@@ -33,7 +33,7 @@ from pysolrandom import constructRandom
 from pysollib.settings import TITLE, PACKAGE_URL
 from pysollib.settings import TOP_TITLE
 from pysollib.settings import DEBUG
-from gamedb import GI
+from pysollib.gamedb import GI
 
 # stats imports
 from stats import FileStatsFormatter

pysollib/app.py

@@ -40,7 +40,7 @@ from pysollib.resource import Sample, SampleManager
 from pysollib.resource import Music, MusicManager
 from images import Images, SubsampledImages
 from pysolrandom import PysolRandom
-from gamedb import GI, GAME_DB, loadGame
+from pysollib.gamedb import GI, GAME_DB, loadGame
 from options import Options
 from pysollib.settings import TOP_SIZE, TOOLKIT
 from pysollib.settings import DEBUG

pysollib/customgame.py

@@ -21,7 +21,7 @@
 ##
 ##---------------------------------------------------------------------------##
 
-from gamedb import registerGame, GameInfo, GI
+from pysollib.gamedb import registerGame, GameInfo, GI
 from pysollib.util import *
 from stack import *
 from game import Game

pysollib/game.py

@@ -38,7 +38,7 @@ from pysollib.mfxutil import format_time, print_err
 from pysollib.settings import PACKAGE, TITLE, TOOLKIT, TOP_TITLE
 from pysollib.settings import VERSION, VERSION_TUPLE
 from pysollib.settings import DEBUG
-from gamedb import GI
+from pysollib.gamedb import GI
 from pysolrandom import PysolRandom, LCRandom31
 from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE
 from pysoltk import CURSOR_WATCH

pysollib/gamedb.py

@@ -30,6 +30,7 @@ from pysollib.mfxutil import Struct, print_err
 from pysollib.resource import CSI
 import pysollib.settings
 
+from pysollib.mygettext import _, n_
 
 # ************************************************************************
 # * constants

pysollib/main.py

@@ -32,7 +32,7 @@ from pysollib.util import DataLoader
 from pysollib.mfxutil import print_err
 from pysollib.resource import Tile
 from app import Application
-from gamedb import GAME_DB
+from pysollib.gamedb import GAME_DB
 from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient
 from pysolaudio import Win32AudioClient, OSSAudioClient, PyGameAudioClient
 from pysollib.settings import TITLE, SOUND_MOD

pysollib/stats.py

@@ -26,8 +26,8 @@
 import time
 
 # PySol imports
-from mfxutil import format_time
+from pysollib.mfxutil import format_time
-from gamedb import GI
+from pysollib.gamedb import GI
 
 
 # ************************************************************************

pysollib/wizardutil.py

@@ -23,7 +23,7 @@
 
 import os
 
-from gamedb import GI, loadGame
+from pysollib.gamedb import GI, loadGame
 from pysollib.util import *
 from stack import *
 from layout import Layout

scripts/gen_individual_importing_tests.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import os.path
-for module_name in ['pysollib.acard', 'pysollib.mfxutil', 'pysollib.move', 'pysollib.resource', 'pysollib.settings', 'pysollib.mygettext', 'pysollib.wizardpresets', 'pysollib.util', ]:
+for module_name in ['pysollib.acard', 'pysollib.mfxutil', 'pysollib.move', 'pysollib.resource', 'pysollib.settings', 'pysollib.mygettext', 'pysollib.wizardpresets', 'pysollib.util', 'pysollib.gamedb', ]:
     open(os.path.join(".", "tests", "individually-importing", "import_" + module_name + ".py"), 'w').write('''#!/usr/bin/env python
 import sys
 sys.path.append("./tests/lib")