diff --git a/i2p2www/formatters.py b/i2p2www/formatters.py index 8cd36825..54b311f8 100644 --- a/i2p2www/formatters.py +++ b/i2p2www/formatters.py @@ -376,17 +376,19 @@ class I2PHtmlFormatter(Formatter): def __init__(self, **options): Formatter.__init__(self, **options) + dec = lambda t, d='': self._decodeifneeded(options.get(t, d)) + getbool = lambda key, d=False: get_bool_opt(options, key, d) self.title = self._decodeifneeded(self.title) - self.nowrap = get_bool_opt(options, 'nowrap', False) - self.noclasses = get_bool_opt(options, 'noclasses', False) + self.nowrap = getbool('nowrap') + self.noclasses = getbool('noclasses') self.classprefix = options.get('classprefix', '') - self.cssclass = self._decodeifneeded(options.get('cssclass', 'highlight')) - self.cssstyles = self._decodeifneeded(options.get('cssstyles', '')) - self.prestyles = self._decodeifneeded(options.get('prestyles', '')) - self.cssfile = self._decodeifneeded(options.get('cssfile', '')) - self.noclobber_cssfile = get_bool_opt(options, 'noclobber_cssfile', False) - self.tagsfile = self._decodeifneeded(options.get('tagsfile', '')) - self.tagurlformat = self._decodeifneeded(options.get('tagurlformat', '')) + self.cssclass = dec('cssclass', 'highlight') + self.cssstyles = dec('cssstyles') + self.prestyles = dec('prestyles') + self.cssfile = dec('cssfile') + self.noclobber_cssfile = getbool('noclobber_cssfile') + self.tagsfile = dec('tagsfile') + self.tagurlformat = dec('tagurlformat') if self.tagsfile: if not ctags: @@ -405,7 +407,7 @@ class I2PHtmlFormatter(Formatter): self.linenostart = abs(get_int_opt(options, 'linenostart', 1)) self.linenostep = abs(get_int_opt(options, 'linenostep', 1)) self.linenospecial = abs(get_int_opt(options, 'linenospecial', 0)) - self.nobackground = get_bool_opt(options, 'nobackground', False) + self.nobackground = getbool('nobackground') self.lineseparator = options.get('lineseparator', '\n') self.lineanchors = options.get('lineanchors', '') self.linespans = options.get('linespans', '') @@ -841,8 +843,9 @@ class TextSpecFormatter(Formatter): def __init__(self, **options): Formatter.__init__(self, **options) - self.tagsfile = self._decodeifneeded(options.get('tagsfile', '')) - self.tagurlformat = self._decodeifneeded(options.get('tagurlformat', '')) + dec = lambda t, d='': self._decodeifneeded(options.get(t, d)) + self.tagsfile = dec('tagsfile', '') + self.tagurlformat = dec('tagurlformat', '') if self.tagsfile: if not ctags: