Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allows unicode strings in config .ini files

Browse Source 
svn: r14424
This commit is contained in:
Doug Blank 2010-02-21 12:59:34 +00:00
parent ccb1f8f4c1
commit ad569fc0d9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gen/utils/configmanager.py
View File

@ -279,7 +279,10 @@ class ConfigManager(object):
####################### Now, let's test and set:
if (name in self.default and
setting in self.default[name]):
if type(value) == type(self.default[name][setting]):
if (isinstance(value, basestring) and
isinstance(self.default[name][setting], basestring)):
self.data[name][setting] = value
elif type(value) == type(self.default[name][setting]):
self.data[name][setting] = value
else:
print >> sys.stderr, ("WARNING: ignoring key with wrong type "
@ -482,10 +485,11 @@ class ConfigManager(object):
# Check value to see if right type:
if type(value) == long:
value = int(value)
if type(value) == unicode:
value = str(value)
if self.has_default(key):
if type(self.get_default(key)) != type(value):
if (isinstance(self.get_default(key), basestring) and
isinstance(value, basestring)):
pass # ok
elif type(self.get_default(key)) != type(value):
raise AttributeError("attempting to set '%s' to wrong type "
"'%s'; should be '%s'" %
(key, type(value),