diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index cd09403b0..7dc1975a2 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -149,9 +149,7 @@ class Config: else: lines += wrapper.wrap('Valid values: {}'.format(', '.join( valid_values))) - lines += wrapper.wrap('Default: {}'.format( - option.default_conf if option.default_conf is not None - else option.default)) + lines += wrapper.wrap('Default: {}'.format(option.default)) return lines def _str_items(self, section): @@ -170,7 +168,7 @@ class Config: section: The section to get the option from. option: The option name fallback: A fallback value. - raw: Whether to get the uninterpolated (but transformed!) value. + raw: Whether to get the uninterpolated, untransformed value. """ logging.debug("getting {} -> {}".format(section, option)) @@ -183,7 +181,7 @@ class Config: return fallback else: if raw: - return val.transformed() + return val newval = self._interpolation.before_get( self, section, option, val.value, self.config[section].values) diff --git a/qutebrowser/config/sections.py b/qutebrowser/config/sections.py index f07af450c..477dfb14e 100644 --- a/qutebrowser/config/sections.py +++ b/qutebrowser/config/sections.py @@ -109,19 +109,18 @@ class ValueList: Attributes: values: An OrderedDict with key as index and value as value. default: An OrderedDict with the default configuration as strings. - After __init__, the strings become key/value types. types: A tuple for (keytype, valuetype) valdict: The "true value" dict. - descriptions: A dict with the description strings for the keys. - Currently a global empty dict to be compatible with - KeyValue section. + #descriptions: A dict with the description strings for the keys. + # Currently a global empty dict to be compatible with + # KeyValue section. """ values = None default = None types = None - descriptions = {} + #descriptions = {} def __init__(self): """Wrap types over default values. Take care when overriding this."""