From 66c535098928785a2b88e33d314079a343aa1d36 Mon Sep 17 00:00:00 2001 From: lxhillwind Date: Thu, 26 Oct 2017 00:06:53 +0800 Subject: [PATCH 1/3] handle of `:config-write-py` generated file --- qutebrowser/config/configfiles.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index 1c6ebff13..ff9dd51e9 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -354,15 +354,16 @@ class ConfigPyWriter: normal_bindings = self._bindings.pop('normal', {}) if normal_bindings: yield self._line('# Bindings for normal mode') - for key, command in sorted(normal_bindings.items()): - yield self._line('config.bind({!r}, {!r})'.format(key, command)) + for key, command in sorted(normal_bindings.items()): + yield self._line('config.bind({!r}, {!r})'.format(key, command)) + yield '' for mode, mode_bindings in sorted(self._bindings.items()): - yield '' yield self._line('# Bindings for {} mode'.format(mode)) for key, command in sorted(mode_bindings.items()): yield self._line('config.bind({!r}, {!r}, mode={!r})'.format( key, command, mode)) + yield '' def read_config_py(filename, raising=False): From 048b792c6feab2fe0689116e04f8445d563e2bf7 Mon Sep 17 00:00:00 2001 From: lxhillwind Date: Thu, 26 Oct 2017 00:52:22 +0800 Subject: [PATCH 2/3] add in `:config-write-py` generated file --- tests/unit/config/test_configfiles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py index b03097266..9efbc6a4e 100644 --- a/tests/unit/config/test_configfiles.py +++ b/tests/unit/config/test_configfiles.py @@ -667,7 +667,7 @@ class TestConfigPyWriter: # Bindings for caret mode config.bind(',y', 'message-info caret', mode='caret') - """).strip() + """).lstrip() def test_binding_options_hidden(self): opt1 = configdata.DATA['bindings.default'] From 4c7f6e53394197ef824b1c7091078db73706db62 Mon Sep 17 00:00:00 2001 From: lxhillwind Date: Thu, 26 Oct 2017 02:04:09 +0800 Subject: [PATCH 3/3] Update configfiles.py: line too long fix --- qutebrowser/config/configfiles.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index ff9dd51e9..27c898611 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -355,7 +355,8 @@ class ConfigPyWriter: if normal_bindings: yield self._line('# Bindings for normal mode') for key, command in sorted(normal_bindings.items()): - yield self._line('config.bind({!r}, {!r})'.format(key, command)) + yield self._line('config.bind({!r}, {!r})'.format( + key, command)) yield '' for mode, mode_bindings in sorted(self._bindings.items()):