From 03c83d7900979d782b05eb4afd51590aefb1f05c Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sun, 25 Nov 2012 17:55:43 +0200
Subject: [PATCH] Convert to pysollib.resource.

This also includes a sys.path.insert(0, ...) fix (to prepend) instead of
sys.append in order to fix finding pysollib/__init.py__ in the global
path.
---
 pysollib/app.py                           | 8 ++++----
 pysollib/gamedb.py                        | 2 +-
 pysollib/images.py                        | 2 +-
 pysollib/layout.py                        | 2 +-
 pysollib/main.py                          | 2 +-
 pysollib/options.py                       | 2 +-
 scripts/gen_individual_importing_tests.py | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pysollib/app.py b/pysollib/app.py
index 89fe7b99..2f986cdb 100644
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -34,10 +34,10 @@ from pysollib.mfxutil import latin1_to_ascii, print_err
 from pysollib.mfxutil import USE_PIL
 from util import CARDSET, IMAGE_EXTENSIONS
 from pysollib.settings import PACKAGE, VERSION_TUPLE, WIN_SYSTEM
-from resource import CSI, CardsetConfig, Cardset, CardsetManager
-from resource import Tile, TileManager
-from resource import Sample, SampleManager
-from resource import Music, MusicManager
+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 images import Images, SubsampledImages
 from pysolrandom import PysolRandom
 from gamedb import GI, GAME_DB, loadGame
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 990b3e47..4a61130e 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -27,7 +27,7 @@ import imp
 
 # PySol imports
 from pysollib.mfxutil import Struct, print_err
-from resource import CSI
+from pysollib.resource import CSI
 import pysollib.settings
 
 
diff --git a/pysollib/images.py b/pysollib/images.py
index ec1b98e5..943a502a 100644
--- a/pysollib/images.py
+++ b/pysollib/images.py
@@ -27,7 +27,7 @@ import os
 import traceback
 
 # PySol imports
-from resource import CSI
+from pysollib.resource import CSI
 from pysollib.settings import TOOLKIT
 from pysollib.mfxutil import Image, ImageTk, USE_PIL
 
diff --git a/pysollib/layout.py b/pysollib/layout.py
index 973f7ce4..6ba13ee0 100644
--- a/pysollib/layout.py
+++ b/pysollib/layout.py
@@ -27,7 +27,7 @@
 # PySol imports
 from pysollib.mfxutil import Struct
 from pysoltk import MfxCanvasText
-from resource import CSI
+from pysollib.resource import CSI
 
 
 # ************************************************************************
diff --git a/pysollib/main.py b/pysollib/main.py
index bb63bc18..c16d2e94 100644
--- a/pysollib/main.py
+++ b/pysollib/main.py
@@ -30,7 +30,7 @@ import getopt
 # PySol imports
 from util import DataLoader
 from pysollib.mfxutil import print_err
-from resource import Tile
+from pysollib.resource import Tile
 from app import Application
 from gamedb import GAME_DB
 from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient
diff --git a/pysollib/options.py b/pysollib/options.py
index 1def5636..01a2d67d 100644
--- a/pysollib/options.py
+++ b/pysollib/options.py
@@ -27,7 +27,7 @@ import traceback
 
 # PySol imports
 from pysollib.mfxutil import print_err
-from resource import CSI
+from pysollib.resource import CSI
 from configobj import configobj, validate
 import pysollib.settings
 
diff --git a/scripts/gen_individual_importing_tests.py b/scripts/gen_individual_importing_tests.py
index e0f9a2e6..0f967a9a 100644
--- a/scripts/gen_individual_importing_tests.py
+++ b/scripts/gen_individual_importing_tests.py
@@ -7,7 +7,7 @@ sys.path.append("./tests/lib")
 from TAP.Simple import plan, ok
 
 plan(1)
-sys.path.append(".")
+sys.path.insert(0, ".")
 import %(module_name)s
 ok(1, "imported")
 ''' % { 'module_name': module_name })