LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'master' into rendermode-options

Browse Source 
Conflicts:
	overviewer.py
This commit is contained in:
Aaron Griffith
2011-09-06 10:29:15 -04:00
parent e800138079 f880f01b46
commit 43629e928b
8 changed files with 70 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overviewer_core/configParser.py
View File

@@ -11,6 +11,7 @@ class ConfigOptionParser(object):
def __init__(self, **kwargs):
self.cmdParser = optparse.OptionParser(usage=kwargs.get("usage",""))
self.configFile = kwargs.get("config","settings.py")
self.listifyDelimiters = kwargs.get("listdelim", ",:/")
self.configVars = []
self.advancedHelp = []
# these are arguments not understood by OptionParser, so they must be removed
@@ -154,7 +155,12 @@ class ConfigOptionParser(object):
if 'listify' in a.keys():
# this thing may be a list!
if configResults.__dict__[n] != None and type(configResults.__dict__[n]) == str:
configResults.__dict__[n] = configResults.__dict__[n].split(a.get("listdelim",","))
delimiters = a.get("listdelim", self.listifyDelimiters)
# replace the rest of the delimiters with the first
for delim in delimiters[1:]:
configResults.__dict__[n] = configResults.__dict__[n].replace(delim, delimiters[0])
# split at each occurance of the first delimiter
configResults.__dict__[n] = configResults.__dict__[n].split(delimiters[0])
elif type(configResults.__dict__[n]) != list:
configResults.__dict__[n] = [configResults.__dict__[n]]
if 'type' in a.keys() and configResults.__dict__[n] != None: