From 615c6ffe5a5b0b9b4ef29007c8b6b45dbe8ac899 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 19 Feb 2018 19:38:45 +0100 Subject: [PATCH] Make :config-write-py work again --- qutebrowser/config/configcommands.py | 7 +++++-- qutebrowser/config/configfiles.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py index f3f8e82b7..3e55cbd57 100644 --- a/qutebrowser/config/configcommands.py +++ b/qutebrowser/config/configcommands.py @@ -313,12 +313,15 @@ class ConfigCommands: "overwrite!".format(filename)) if defaults: - options = [(opt, opt.default) + options = [(None, opt, opt.default) for _name, opt in sorted(configdata.DATA.items())] bindings = dict(configdata.DATA['bindings.default'].default) commented = True else: - options = list(self._config) + options = [] + for values in self._config: + for scoped in values: + options.append((scoped.pattern, values.opt, scoped.value)) bindings = dict(self._config.get_mutable_obj('bindings.commands')) commented = False diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index 2c26058a8..cc306b1c9 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -388,7 +388,8 @@ class ConfigPyWriter: def _gen_options(self): """Generate the options part of the config.""" - for opt, value in self._options: + # FIXME:conf handle _pattern + for _pattern, opt, value in self._options: if opt.name in ['bindings.commands', 'bindings.default']: continue