Convert mfxutil and settings imports to pysollib

pysollib/acard.py

@@ -26,7 +26,7 @@
 from random import randint
 
 # PySol imports
-from mfxutil import SubclassResponsibility
+from pysollib.mfxutil import SubclassResponsibility
 
 # ************************************************************************
 # *

pysollib/actions.py

@@ -26,13 +26,13 @@
 import os, locale
 
 # PySol imports
-from mfxutil import SubclassResponsibility
-from mfxutil import Struct, openURL
-from mfxutil import print_err
+from pysollib.mfxutil import SubclassResponsibility
+from pysollib.mfxutil import Struct, openURL
+from pysollib.mfxutil import print_err
 from pysolrandom import constructRandom
-from settings import TITLE, PACKAGE_URL
-from settings import TOP_TITLE
-from settings import DEBUG
+from pysollib.settings import TITLE, PACKAGE_URL
+from pysollib.settings import TOP_TITLE
+from pysollib.settings import DEBUG
 from gamedb import GI
 
 # stats imports

pysollib/app.py

@@ -27,13 +27,13 @@ import os, re
 import traceback
 
 # PySol imports
-from mfxutil import destruct, Struct
-from mfxutil import pickle, unpickle, UnpicklingError
-from mfxutil import getusername, getprefdir
-from mfxutil import latin1_to_ascii, print_err
-from mfxutil import USE_PIL
+from pysollib.mfxutil import destruct, Struct
+from pysollib.mfxutil import pickle, unpickle, UnpicklingError
+from pysollib.mfxutil import getusername, getprefdir
+from pysollib.mfxutil import latin1_to_ascii, print_err
+from pysollib.mfxutil import USE_PIL
 from util import CARDSET, IMAGE_EXTENSIONS
-from settings import PACKAGE, VERSION_TUPLE, WIN_SYSTEM
+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
@@ -42,8 +42,8 @@ from images import Images, SubsampledImages
 from pysolrandom import PysolRandom
 from gamedb import GI, GAME_DB, loadGame
 from options import Options
-from settings import TOP_SIZE, TOOLKIT
-from settings import DEBUG
+from pysollib.settings import TOP_SIZE, TOOLKIT
+from pysollib.settings import DEBUG
 from winsystems import TkSettings
 
 # Toolkit imports

pysollib/game.py

@@ -30,14 +30,14 @@ from gettext import ungettext
 from cStringIO import StringIO
 
 # PySol imports
-from mfxutil import Pickler, Unpickler, UnpicklingError
-from mfxutil import Image, ImageTk, USE_PIL
-from mfxutil import destruct, Struct, SubclassResponsibility
-from mfxutil import uclock, usleep
-from mfxutil import format_time, print_err
-from settings import PACKAGE, TITLE, TOOLKIT, TOP_TITLE
-from settings import VERSION, VERSION_TUPLE
-from settings import DEBUG
+from pysollib.mfxutil import Pickler, Unpickler, UnpicklingError
+from pysollib.mfxutil import Image, ImageTk, USE_PIL
+from pysollib.mfxutil import destruct, Struct, SubclassResponsibility
+from pysollib.mfxutil import uclock, usleep
+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 pysolrandom import PysolRandom, LCRandom31
 from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE

pysollib/gamedb.py

@@ -26,7 +26,7 @@
 import imp
 
 # PySol imports
-from mfxutil import Struct, print_err
+from pysollib.mfxutil import Struct, print_err
 from resource import CSI
 import pysollib.settings
 

pysollib/help.py

@@ -25,7 +25,7 @@
 # imports
 
 # PySol imports
-from settings import TITLE, PACKAGE_URL, TOOLKIT, VERSION
+from pysollib.settings import TITLE, PACKAGE_URL, TOOLKIT, VERSION
 from pysoltk import make_help_toplevel
 from pysoltk import MfxMessageDialog
 from pysoltk import PysolAboutDialog

pysollib/hint.py

@@ -29,8 +29,8 @@ import subprocess
 import re
 
 # PySol imports
-from settings import DEBUG, FCS_COMMAND
-from mfxutil import destruct
+from pysollib.settings import DEBUG, FCS_COMMAND
+from pysollib.mfxutil import destruct
 from util import KING
 
 

pysollib/images.py

@@ -28,8 +28,8 @@ import traceback
 
 # PySol imports
 from resource import CSI
-from settings import TOOLKIT
-from mfxutil import Image, ImageTk, USE_PIL
+from pysollib.settings import TOOLKIT
+from pysollib.mfxutil import Image, ImageTk, USE_PIL
 
 # Toolkit imports
 from pysoltk import loadImage, copyImage, createImage, shadowImage, createBottom, resizeBottom

pysollib/layout.py

@@ -25,7 +25,7 @@
 # imports
 
 # PySol imports
-from mfxutil import Struct
+from pysollib.mfxutil import Struct
 from pysoltk import MfxCanvasText
 from resource import CSI
 

pysollib/main.py

@@ -29,13 +29,13 @@ import getopt
 
 # PySol imports
 from util import DataLoader
-from mfxutil import print_err
+from pysollib.mfxutil import print_err
 from resource import Tile
 from app import Application
 from gamedb import GAME_DB
 from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient
 from pysolaudio import Win32AudioClient, OSSAudioClient, PyGameAudioClient
-from settings import TITLE, SOUND_MOD
+from pysollib.settings import TITLE, SOUND_MOD
 from winsystems import init_root_window
 
 # Toolkit imports

pysollib/mfxutil.py

@@ -36,7 +36,7 @@ try:
 except:
     thread = None
 
-from settings import PACKAGE, TOOLKIT, USE_TILE
+from pysollib.settings import PACKAGE, TOOLKIT, USE_TILE
 
 Image = ImageTk = ImageOps = None
 if TOOLKIT == 'tk':

pysollib/options.py

@@ -26,7 +26,7 @@ import sys, os
 import traceback
 
 # PySol imports
-from mfxutil import print_err
+from pysollib.mfxutil import print_err
 from resource import CSI
 from configobj import configobj, validate
 import pysollib.settings

pysollib/pysolrandom.py

@@ -25,7 +25,7 @@
 # imports
 import sys, re, time
 import random
-from mfxutil import SubclassResponsibility
+from pysollib.mfxutil import SubclassResponsibility
 
 
 # ************************************************************************

pysollib/pysoltk.py

@@ -21,7 +21,7 @@
 ##
 ##---------------------------------------------------------------------------##
 
-from settings import TOOLKIT, USE_TILE
+from pysollib.settings import TOOLKIT, USE_TILE
 
 if TOOLKIT == 'tk':
     if USE_TILE:

pysollib/resource.py

@@ -26,8 +26,8 @@
 import os, glob, traceback
 
 # PySol imports
-from mfxutil import Struct, KwStruct
-from settings import DEBUG
+from pysollib.mfxutil import Struct, KwStruct
+from pysollib.settings import DEBUG
 
 
 # ************************************************************************

pysollib/stack.py

@@ -96,8 +96,8 @@ __all__ = ['cardsFaceUp',
 import types
 
 # PySol imports
-from mfxutil import Struct, kwdefault, SubclassResponsibility
-from mfxutil import Image, ImageTk, USE_PIL
+from pysollib.mfxutil import Struct, kwdefault, SubclassResponsibility
+from pysollib.mfxutil import Image, ImageTk, USE_PIL
 from util import ACE, KING
 from util import ANY_SUIT, ANY_COLOR, ANY_RANK, NO_RANK
 from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE
@@ -108,8 +108,8 @@ from pysoltk import after, after_idle, after_cancel
 from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText, MfxCanvasLine
 from pysoltk import get_text_width
 from pysoltk import markImage
-from settings import TOOLKIT
-from settings import DEBUG
+from pysollib.settings import TOOLKIT
+from pysollib.settings import DEBUG
 
 
 # ************************************************************************

pysollib/util.py

@@ -49,8 +49,8 @@ __all__ = ['SUITS',
 import sys, os
 
 # PySol imports
-from settings import DATA_DIRS, TOOLKIT
-from mfxutil import Image
+from pysollib.settings import DATA_DIRS, TOOLKIT
+from pysollib.mfxutil import Image
 
 
 # ************************************************************************