From 98a026b2a2eab7d42defc6ffc87be23a22b5d3ba Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 6 Aug 2014 07:11:14 +0200 Subject: [PATCH] Make sure there are no duplicate keys in default config. --- qutebrowser/config/sections.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qutebrowser/config/sections.py b/qutebrowser/config/sections.py index 7cacde139..d6b7049b4 100644 --- a/qutebrowser/config/sections.py +++ b/qutebrowser/config/sections.py @@ -110,6 +110,7 @@ class KeyValue(Section): return self.values = OrderedDict() for (k, v, desc) in defaults: + assert k not in self.values, k self.values[k] = v self.descriptions[k] = desc @@ -160,11 +161,14 @@ class ValueList(Section): self.keytype = keytype self.valtype = valtype self.layers = OrderedDict([ - ('default', OrderedDict([(key, SettingValue(valtype, value)) - for key, value in defaults])), + ('default', OrderedDict()), ('conf', OrderedDict()), ('temp', OrderedDict()), ]) + defaultlayer = self.layers['default'] + for key, value in defaults: + assert key not in defaultlayer, key + defaultlayer[key] = SettingValue(valtype, value) self.values = ChainMap(self.layers['temp'], self.layers['conf'], self.layers['default'])