diff options
author | doug <doug@printer-g589.(none)> | 2009-09-02 20:51:40 (GMT) |
---|---|---|
committer | doug <doug@printer-g589.(none)> | 2009-09-02 20:51:40 (GMT) |
commit | a836b1710a95561b94fb35f21ee42eb5a8ef828b (patch) | |
tree | 7bb5f83315e8f6afd5d9763385e22d525f2eaa4c | |
parent | 3185c52f8809f10f45eadd68eca425e00b2f96e1 (diff) |
removed conflicted files
-rw-r--r-- | src/setup/__init__.py | 1 | ||||
-rw-r--r-- | src/setup/level.py | 32 | ||||
-rw-r--r-- | src/setup/main.py | 22 |
3 files changed, 0 insertions, 55 deletions
diff --git a/src/setup/__init__.py b/src/setup/__init__.py deleted file mode 100644 index a003759..0000000 --- a/src/setup/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# this is a package diff --git a/src/setup/level.py b/src/setup/level.py deleted file mode 100644 index 5806830..0000000 --- a/src/setup/level.py +++ /dev/null @@ -1,32 +0,0 @@ -''' - -''' -from lxml import etree # using lxml for XML processing -from utils import strs # string constants -from utils import utils # some XML utilities - - -class Level(object): - ''' - ''' - - def __init__(self, path): - '''Constructor''' - - #open up the mlvl file and read in its basic properties - root = utils.getXMLRoot(path) - self.name = root.xpath(strs.XP_LevelName)[0] - self.description = root.xpath(strs.XP_LevelName)[0] - self.path = path - pass - - def getName(self): - '''Returns the name of this level''' - return self.name - - def getDescription(self): - '''Returns the description of this level''' - return self.description - - -
\ No newline at end of file diff --git a/src/setup/main.py b/src/setup/main.py deleted file mode 100644 index 82e5d18..0000000 --- a/src/setup/main.py +++ /dev/null @@ -1,22 +0,0 @@ -'''''' - -#why? -if __name__ == '__main__': - pass - -import sys -sys.path.append('./src/') - -import menus -from utils import strs - -# setup logging -import logging -logging.basicConfig(filename=strs.LoggingFile,level=logging.DEBUG) -log = logging.getLogger('setup.main') - -# start the menus -menus.begin() - -print( 'done' ) - |