Fix issues with Python 3.5

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))
 

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')

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']