Ticket #246: import_patch.diff

game/scripts/gui/context_menu.py

@@ -15 +15 @@
 #   You should have received a copy of the GNU General Public License
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 
-import fife
-import pychan
+from fife import fife
+from fife.extensions import pychan
 
 class ContextMenu(object):
     def __init__(self, engine, menu_items, pos):

game/scripts/gui/dialoguegui.py

@@ -15 +15 @@
 #   You should have received a copy of the GNU General Public License
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 
-import pychan
-import fife
-import pychan.widgets as widgets
+from fife import fife
+from fife.extensions import pychan
+from fife.extensions.pychan import widgets
+
 from scripts.dialogue import DialogueEngine
 
 class DialogueGUI(object):

game/scripts/gui/hud.py

@@ -16 +16 @@
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 
 import shutil
-import fife
-import pychan
-import pychan.widgets as widgets
-from pychan.tools import callbackWithArguments as cbwa
+from fife import fife
+from fife.extensions import pychan
+from fife.extensions.pychan.tools import callbackWithArguments as cbwa
+from fife.extensions.pychan import widgets
+
 from scripts.gui.filebrowser import FileBrowser
 from scripts.gui.context_menu import ContextMenu
 from scripts.gui import inventorygui

game/scripts/gui/inventorygui.py

@@ -15 +15 @@
 #   You should have received a copy of the GNU General Public License
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 
-import fife
-import pychan
+from fife import fife
+from fife.extensions import pychan
+from fife.extensions.pychan.tools import callbackWithArguments as cbwa
+
 from scripts.gui import drag_drop_data as data_drag
-from pychan.tools import callbackWithArguments as cbwa
 
 class InventoryGUI(object):
     """Inventory GUI class"""

game/scripts/gui/filebrowser.py

@@ -13 +13 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import pychan
-import pychan.widgets as widgets
+from fife.extensions import pychan
+from fife.extensions.pychan import widgets
+
 import sys
 
 def u2s(string):

game/scripts/gui/popups.py

@@ -15 +15 @@
 #   You should have received a copy of the GNU General Public License
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 
-import fife
-import pychan
+from fife import fife
+from fife.extensions import pychan
+from fife.extensions.pychan.tools import callbackWithArguments as cbwa
+
 from scripts.gui import drag_drop_data as data_drag
 from scripts.items import item_image_dict
-from pychan.tools import callbackWithArguments as cbwa
 
 class ContainerGUI():
     def __init__(self, engine, title, container):

game/scripts/common/eventlistenerbase.py

@@ -15 +15 @@
 #   You should have received a copy of the GNU General Public License
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 
-import fife
+from fife import fife
 
 class EventListenerBase(fife.IKeyListener, fife.ICommandListener, fife.IMouseListener, fife.ConsoleExecuter):
     def __init__(self, engine, reg_keys=False, reg_cmd=False, reg_mouse=False, reg_console=False, reg_widget=False):

game/scripts/objects/base.py

@@ -50 +50 @@
        def __init__ (self, *args, **kwargs):
            super(TinCan,self).__init__ (*args, **kwargs)
            self.name = 'Tin Can'"""
-import fife
+from fife import fife
 from settings import Setting
 from random import randrange
 from scripts.gui.popups import ExaminePopup, ContainerGUI

game/scripts/objects/actors.py

@@ -14 +14 @@
 
 #   You should have received a copy of the GNU General Public License
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
-import fife
+
+from fife import fife
 from scripts import world
 from base import *
 from composed import *

game/scripts/objects/containers.py

@@ -24 +24 @@
 
 from composed import ImmovableContainer
 from composed import CarryableItem
-import fife
+from fife import fife
 
 class WoodenCrate (ImmovableContainer):
     def __init__ (self, ID, name = 'Wooden Crate', \

game/scripts/map.py

@@ -15 +15 @@
 #   You should have received a copy of the GNU General Public License
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 
-import fife
+from fife import fife
 import time
 from local_loaders.loaders import loadMapFile
 from scripts.common.eventlistenerbase import EventListenerBase

game/scripts/world.py

@@ -17 +17 @@
 
 import time
 import fife
-import pychan
+from fife.extensions import pychan
 from sounds import SoundEngine
 from datetime import date
 from scripts.common.eventlistenerbase import EventListenerBase
@@ -26 +26 @@
 from settings import Setting
 from scripts.gui import hud
 from scripts.gui.popups import *
-from pychan.tools import callbackWithArguments as cbwa
+from fife.extensions.pychan.tools import callbackWithArguments as cbwa
 from map import Map
 
 TDS = Setting()

game/run.py

@@ -23 +23 @@
 if not os.path.exists('settings.xml'):
     shutil.copyfile('settings-dist.xml', 'settings.xml')
 
-import fife_compat, fife, fifelog
-import pychan
+from fife import fife
+from fife.extensions import fife_compat, fifelog, pychan
+from fife.extensions.basicapplication import ApplicationBase
+
 from scripts import world
 from scripts import engine
 from scripts import console
 from scripts.engine import Engine
 from scripts.common import eventlistenerbase
-from basicapplication import ApplicationBase
 from settings import Setting
 
 TDS = Setting()

game/local_loaders/loaders.py

@@ -16 +16 @@
 # Most of this code was copied from the FIFE file loaders.py
 # It is part of the local code base now so we customize what happens as 
 # we read map files
-import fife
+from fife import fife
 
 from xmlmap import XMLMapLoader
-from serializers import WrongFileType, NameClash
+from fife.extensions.serializers import WrongFileType, NameClash
 
-from serializers.xmlobject import XMLObjectLoader
+from fife.extensions.serializers.xmlobject import XMLObjectLoader
 
 fileExtensions = ('xml',)
 

game/local_loaders/xmlmap.py

@@ -17 +17 @@
 # It is part of the local code base now so we can customize what happens
 # as we read map files
 
-import fife 
+import sys, os
+
+from fife import fife 
 try:
     import xml.etree.cElementTree as ET
 except:
     import xml.etree.ElementTree as ET
 
-import loaders
-from serializers import *
+from fife.extensions import loaders
+from fife.extensions import serializers
 import time
 
 FORMAT = '1.0'
 
+def root_subfile(masterfile, subfile):
+        '''
+        Returns new path for given subfile (path), which is rooted against masterfile
+        E.g. if masterfile is ./../foo/bar.xml and subfile is ./../foo2/subfoo.xml,
+        returned path is ../foo2/subfoo.xml
+        NOTE: masterfile is expected to be *file*, not directory. subfile can be either
+        '''
+        s = '/'
+
+        masterfile = norm_path(os.path.abspath(masterfile))
+        subfile = norm_path(os.path.abspath(subfile))
+
+        master_fragments = masterfile.split(s)
+        sub_fragments = subfile.split(s)
+
+        master_leftovers = []
+        sub_leftovers = []
+
+        for i in xrange(len(master_fragments)):
+                try:
+                        if master_fragments[i] == sub_fragments[i]:
+                                master_leftovers = master_fragments[i+1:]
+                                sub_leftovers = sub_fragments[i+1:]
+                except IndexError:
+                        break
+
+        pathstr = ''
+        for f in master_leftovers[:-1]:
+                pathstr += '..' + s
+        pathstr += s.join(sub_leftovers)
+        return pathstr
+
+def reverse_root_subfile(masterfile, subfile):
+        '''
+        does inverse operation to root_subfile. E.g. 
+        E.g. if masterfile is ./../foo/bar.xml and subfile is ../foo2/subfoo.xml,
+        returned path ./../foo2/subfoo.xml
+        Usually this function is used to convert saved paths into engine relative paths
+        NOTE: masterfile is expected to be *file*, not directory. subfile can be either
+        '''
+        s = '/'
+
+        masterfile = norm_path(os.path.abspath(masterfile)).split(s)[:-1]
+        subfile = norm_path(os.path.abspath( s.join(masterfile) + s + subfile ))
+        masterfile = norm_path(os.getcwd()) + s + 'foo.bar' # cheat a little to satisfy root_subfile
+        return root_subfile(masterfile, subfile)
+
+def norm_path(path):
+        '''
+        Makes the path use '/' delimited separators. FIFE always uses these delimiters, but some os-related
+  routines will default to os.path.sep.
+        '''
+        if os.path.sep == '/':
+                return path
+
+        return '/'.join(path.split(os.path.sep))        
+
 class XMLMapLoader(fife.ResourceLoader):
     def __init__(self, engine, data, callback):
         """ The XMLMapLoader parses the xml map using several section. 

game/local_loaders/__init__.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+
+# ####################################################################
+#  Copyright (C) 2005-2009 by the FIFE team
+#  http://www.fifengine.de
+#  This file is part of FIFE.
+#
+#  FIFE is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the
+#  Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+# ####################################################################
+
+import sys, os
+from fife import fife
+from traceback import print_exc
+
+__all__ = ('ET', 'SerializerError', 'InvalidFormat', 'WrongFileType', 'NameClash', 'NotFound', 'warn', 'root_subfile', 'reverse_root_subfile')
+
+try:
+        import xml.etree.cElementTree as ET
+except:
+        import xml.etree.ElementTree as ET
+
+class SerializerError(Exception):
+        pass
+
+class InvalidFormat(SerializerError):
+        pass
+
+class WrongFileType(SerializerError):
+        pass
+
+class NameClash(SerializerError):
+        pass
+
+class NotFound(SerializerError):
+        pass
+
+def warn(self, msg):
+        print 'Warning (%s): %s' % (self.filename, msg)
+
+def root_subfile(masterfile, subfile):
+        '''
+        Returns new path for given subfile (path), which is rooted against masterfile
+        E.g. if masterfile is ./../foo/bar.xml and subfile is ./../foo2/subfoo.xml,
+        returned path is ../foo2/subfoo.xml
+        NOTE: masterfile is expected to be *file*, not directory. subfile can be either
+        '''
+        s = '/'
+
+        masterfile = norm_path(os.path.abspath(masterfile))
+        subfile = norm_path(os.path.abspath(subfile))
+
+        master_fragments = masterfile.split(s)
+        sub_fragments = subfile.split(s)
+
+        master_leftovers = []
+        sub_leftovers = []
+
+        for i in xrange(len(master_fragments)):
+                try:
+                        if master_fragments[i] == sub_fragments[i]:
+                                master_leftovers = master_fragments[i+1:]
+                                sub_leftovers = sub_fragments[i+1:]
+                except IndexError:
+                        break
+
+        pathstr = ''
+        for f in master_leftovers[:-1]:
+                pathstr += '..' + s
+        pathstr += s.join(sub_leftovers)
+        return pathstr
+
+def reverse_root_subfile(masterfile, subfile):
+        '''
+        does inverse operation to root_subfile. E.g. 
+        E.g. if masterfile is ./../foo/bar.xml and subfile is ../foo2/subfoo.xml,
+        returned path ./../foo2/subfoo.xml
+        Usually this function is used to convert saved paths into engine relative paths
+        NOTE: masterfile is expected to be *file*, not directory. subfile can be either
+        '''
+        s = '/'
+
+        masterfile = norm_path(os.path.abspath(masterfile)).split(s)[:-1]
+        subfile = norm_path(os.path.abspath( s.join(masterfile) + s + subfile ))
+        masterfile = norm_path(os.getcwd()) + s + 'foo.bar' # cheat a little to satisfy root_subfile
+        return root_subfile(masterfile, subfile)
+
+def norm_path(path):
+        '''
+        Makes the path use '/' delimited separators. FIFE always uses these delimiters, but some os-related
+  routines will default to os.path.sep.
+        '''
+        if os.path.sep == '/':
+                return path
+
+        return '/'.join(path.split(os.path.sep))