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

@@ -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

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
 
 

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
 

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
 
 
 # ************************************************************************

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

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
 

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 })