From 0528a800f264a52b7dfdbff21c5d2b64a9001ad2 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 4 Jul 2017 07:41:40 +0200 Subject: [PATCH] Fix config things relying on dict order --- qutebrowser/config/config.py | 2 +- qutebrowser/config/configdata.py | 2 +- tests/unit/config/test_config.py | 4 ++-- tests/unit/config/test_configdata.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index a1a98fa4c..2d7ae035e 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -480,7 +480,7 @@ class Config(QObject): The changed config part as string. """ lines = [] - for optname, value in self._values.items(): + for optname, value in sorted(self._values.items()): opt = self.get_opt(optname) str_value = opt.typ.to_str(value) lines.append('{} = {}'.format(optname, str_value)) diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index 9afbc2c77..646f9d887 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -129,7 +129,7 @@ def _parse_yaml_backends_dict(name, node): 'Qt 5.8': qtutils.version_check('5.8'), 'Qt 5.9': qtutils.version_check('5.9'), } - for key in node.keys(): + for key in sorted(node.keys()): if conditionals[node[key]]: backends.append(str_to_backend[key]) diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index c97d665bc..1a67ed5fb 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -743,8 +743,8 @@ class TestConfig: def test_dump_userconfig(self, conf): conf.set_obj('content.plugins', True) conf.set_obj('content.headers.custom', {'X-Foo': 'bar'}) - lines = ['content.plugins = true', - 'content.headers.custom = {"X-Foo": "bar"}'] + lines = ['content.headers.custom = {"X-Foo": "bar"}', + 'content.plugins = true'] assert conf.dump_userconfig().splitlines() == lines def test_dump_userconfig_default(self, conf): diff --git a/tests/unit/config/test_configdata.py b/tests/unit/config/test_configdata.py index fa7d60fc0..45d6bde19 100644 --- a/tests/unit/config/test_configdata.py +++ b/tests/unit/config/test_configdata.py @@ -219,8 +219,8 @@ class TestParseYamlBackend: assert backends == expected @pytest.mark.parametrize('webkit, has_new_version, expected', [ - (True, True, [usertypes.Backend.QtWebKit, - usertypes.Backend.QtWebEngine]), + (True, True, [usertypes.Backend.QtWebEngine, + usertypes.Backend.QtWebKit]), (False, True, [usertypes.Backend.QtWebEngine]), (True, False, [usertypes.Backend.QtWebKit]), ])