From 308ede18ff19b48626e541316b59984fb8a6c5cc Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sun, 25 Nov 2012 17:05:22 +0200 Subject: [PATCH] Convert mfxutil and settings imports to pysollib --- pysollib/acard.py | 2 +- pysollib/actions.py | 12 ++++++------ pysollib/app.py | 16 ++++++++-------- pysollib/game.py | 16 ++++++++-------- pysollib/gamedb.py | 2 +- pysollib/help.py | 2 +- pysollib/hint.py | 4 ++-- pysollib/images.py | 4 ++-- pysollib/layout.py | 2 +- pysollib/main.py | 4 ++-- pysollib/mfxutil.py | 2 +- pysollib/options.py | 2 +- pysollib/pysolrandom.py | 2 +- pysollib/pysoltk.py | 2 +- pysollib/resource.py | 4 ++-- pysollib/stack.py | 8 ++++---- pysollib/util.py | 4 ++-- 17 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pysollib/acard.py b/pysollib/acard.py index 8ac035b8..89673a33 100644 --- a/pysollib/acard.py +++ b/pysollib/acard.py @@ -26,7 +26,7 @@ from random import randint # PySol imports -from mfxutil import SubclassResponsibility +from pysollib.mfxutil import SubclassResponsibility # ************************************************************************ # * diff --git a/pysollib/actions.py b/pysollib/actions.py index 056c037d..3da71c1f 100644 --- a/pysollib/actions.py +++ b/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 diff --git a/pysollib/app.py b/pysollib/app.py index 5cae2af3..89fe7b99 100644 --- a/pysollib/app.py +++ b/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 diff --git a/pysollib/game.py b/pysollib/game.py index adf7e38b..c8f893f9 100644 --- a/pysollib/game.py +++ b/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 diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index 6c7cd1a4..990b3e47 100644 --- a/pysollib/gamedb.py +++ b/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 diff --git a/pysollib/help.py b/pysollib/help.py index 2e7c11d6..dbb0335e 100644 --- a/pysollib/help.py +++ b/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 diff --git a/pysollib/hint.py b/pysollib/hint.py index ba53daac..65ef0a85 100644 --- a/pysollib/hint.py +++ b/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 diff --git a/pysollib/images.py b/pysollib/images.py index 18547d61..ec1b98e5 100644 --- a/pysollib/images.py +++ b/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 diff --git a/pysollib/layout.py b/pysollib/layout.py index 5347c058..973f7ce4 100644 --- a/pysollib/layout.py +++ b/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 diff --git a/pysollib/main.py b/pysollib/main.py index 943f611e..bb63bc18 100644 --- a/pysollib/main.py +++ b/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 diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py index d0c00900..b71d1254 100644 --- a/pysollib/mfxutil.py +++ b/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': diff --git a/pysollib/options.py b/pysollib/options.py index 88b774ed..1def5636 100644 --- a/pysollib/options.py +++ b/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 diff --git a/pysollib/pysolrandom.py b/pysollib/pysolrandom.py index e6fbb004..1b38f3a9 100644 --- a/pysollib/pysolrandom.py +++ b/pysollib/pysolrandom.py @@ -25,7 +25,7 @@ # imports import sys, re, time import random -from mfxutil import SubclassResponsibility +from pysollib.mfxutil import SubclassResponsibility # ************************************************************************ diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py index 68940ea5..ec0c2afe 100644 --- a/pysollib/pysoltk.py +++ b/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: diff --git a/pysollib/resource.py b/pysollib/resource.py index b508c909..b3cabdce 100644 --- a/pysollib/resource.py +++ b/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 # ************************************************************************ diff --git a/pysollib/stack.py b/pysollib/stack.py index f11aac82..13d4a159 100644 --- a/pysollib/stack.py +++ b/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 # ************************************************************************ diff --git a/pysollib/util.py b/pysollib/util.py index 8de3f007..03a71b0f 100644 --- a/pysollib/util.py +++ b/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 # ************************************************************************