From 9685445559e557eb5ce57694a501894a4045feb9 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 20 Feb 2018 17:22:11 +0100 Subject: [PATCH] Fix issues with Python 3.5 --- qutebrowser/config/config.py | 2 +- tests/unit/config/test_config.py | 2 +- tests/unit/config/test_configinit.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index 95cd5723b..9b90562c4 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -447,7 +447,7 @@ class Config(QObject): The changed config part as string. """ blocks = [] - for values in self: + for values in sorted(self, key=lambda v: v.opt.name): if values: blocks.append(str(values)) diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index 66176b6ac..4be4d8dec 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -530,7 +530,7 @@ class TestConfig: """Make sure mutable types are only copied once.""" spy = mocker.spy(config.copy, 'deepcopy') conf.get_mutable_obj('bindings.commands') - spy.assert_called_once() + spy.assert_called_once_with(mocker.ANY) def test_get_obj_for_pattern(self, conf): pattern = urlmatch.UrlPattern('*://example.com') diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py index c139ff6b9..e7d217d8e 100644 --- a/tests/unit/config/test_configinit.py +++ b/tests/unit/config/test_configinit.py @@ -186,8 +186,8 @@ class TestEarlyInit: if config_py and load_autoconfig and not invalid_yaml: expected = [ - 'colors.hints.fg = magenta', 'colors.hints.bg = red', + 'colors.hints.fg = magenta', ] elif config_py: expected = ['colors.hints.bg = red']