itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle bogus config values better; err() and keep going rather than raising an exception. 

If there are exceptions, return to eating them for 0.10.
This commit is contained in:
Thomas Hurst 2008-08-26 23:32:29 +01:00
parent f020eaa32b
commit d01ed3554f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
terminatorlib/config.py
View File

@ -33,6 +33,7 @@ up, set a default for it first."""
import os, platform, sys, re import os, platform, sys, re
import pwd import pwd
import gtk
# set this to true to enable debugging output # set this to true to enable debugging output
# These should be moved somewhere better. # These should be moved somewhere better.
@ -210,7 +211,6 @@ class TerminatorConfValuestoreRC (TerminatorConfValuestore):
try: try:
ini.parse() ini.parse()
except ParsedWithErrors, e: except ParsedWithErrors, e:
import gtk
from cgi import escape from cgi import escape
msg = _("""Errors were encountered while parsing terminator_config(5) file: msg = _("""Errors were encountered while parsing terminator_config(5) file:
@ -235,13 +235,20 @@ Some lines have been ignored.""") % escape(repr(self.rcfilename))
continue continue
deftype = Defaults[key].__class__.__name__ deftype = Defaults[key].__class__.__name__
if deftype == 'bool': if key.endswith('_color'):
try:
gtk.gdk.color_parse(value)
except ValueError:
err(_("Setting %s value %s not a valid colour; ignoring") % (key,repr(value)))
continue
elif deftype == 'bool':
if value.lower () in ('true', 'yes', 'on'): if value.lower () in ('true', 'yes', 'on'):
self.values[key] = True self.values[key] = True
elif value.lower () in ('false', 'no', 'off'): elif value.lower () in ('false', 'no', 'off'):
self.values[key] = False self.values[key] = False
else: else:
raise AttributeError err(_("Boolean setting %s expecting one of: yes, no, true, false, on, off") % key)
continue
elif deftype == 'int': elif deftype == 'int':
self.values[key] = int (value) self.values[key] = int (value)
elif deftype == 'float': elif deftype == 'float':
@ -251,15 +258,15 @@ Some lines have been ignored.""") % escape(repr(self.rcfilename))
continue continue
elif deftype == 'dict': elif deftype == 'dict':
if type(value) != dict: if type(value) != dict:
raise AttributeError err(_("Value %s should be a section name, not a setting") % key)
continue
self.values[key] = value self.values[key] = value
else: else:
self.values[key] = value self.values[key] = value
dbg (" VS_RCFile: Set value '%s' to '%s'" % (key, self.values[key])) dbg (" VS_RCFile: Set value '%s' to %s" % (key, repr(self.values[key])))
except Exception, e: except Exception, e:
dbg (" VS_RCFile: %s Exception handling: %s" % (type(e), key)) dbg (" VS_RCFile: %s Exception handling: %s" % (type(e), key))
raise e
pass pass
class TerminatorConfValuestoreGConf (TerminatorConfValuestore): class TerminatorConfValuestoreGConf (TerminatorConfValuestore):