From 884a44ceb0a6ab47891a47755693a656ab5e98ed Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sun, 25 Nov 2012 18:07:40 +0200
Subject: [PATCH] gamedb.

---
 pysollib/actions.py                       | 2 +-
 pysollib/app.py                           | 2 +-
 pysollib/customgame.py                    | 2 +-
 pysollib/game.py                          | 2 +-
 pysollib/gamedb.py                        | 1 +
 pysollib/main.py                          | 2 +-
 pysollib/stats.py                         | 4 ++--
 pysollib/wizardutil.py                    | 2 +-
 scripts/gen_individual_importing_tests.py | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pysollib/actions.py b/pysollib/actions.py
index 3da71c1f..73e30f7c 100644
--- a/pysollib/actions.py
+++ b/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
diff --git a/pysollib/app.py b/pysollib/app.py
index 8ca6f8ed..2c0e7ddf 100644
--- a/pysollib/app.py
+++ b/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
diff --git a/pysollib/customgame.py b/pysollib/customgame.py
index 8df3cea7..92dfcfe0 100644
--- a/pysollib/customgame.py
+++ b/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
diff --git a/pysollib/game.py b/pysollib/game.py
index c8f893f9..d7ba27fe 100644
--- a/pysollib/game.py
+++ b/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
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 4a61130e..f2f6c1e3 100644
--- a/pysollib/gamedb.py
+++ b/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
diff --git a/pysollib/main.py b/pysollib/main.py
index f1cf3355..fa5b173a 100644
--- a/pysollib/main.py
+++ b/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
diff --git a/pysollib/stats.py b/pysollib/stats.py
index 16249efb..3787375d 100644
--- a/pysollib/stats.py
+++ b/pysollib/stats.py
@@ -26,8 +26,8 @@
 import time
 
 # PySol imports
-from mfxutil import format_time
-from gamedb import GI
+from pysollib.mfxutil import format_time
+from pysollib.gamedb import GI
 
 
 # ************************************************************************
diff --git a/pysollib/wizardutil.py b/pysollib/wizardutil.py
index e4ba2471..fc01ecc9 100644
--- a/pysollib/wizardutil.py
+++ b/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
diff --git a/scripts/gen_individual_importing_tests.py b/scripts/gen_individual_importing_tests.py
index 14c7f515..b38c51ee 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.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")