rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure there are no duplicate keys in default config.

Browse Source
This commit is contained in:
Florian Bruhin 2014-08-06 07:11:14 +02:00
parent 2868ea2236
commit 98a026b2a2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/config/sections.py
View File

@ -110,6 +110,7 @@ class KeyValue(Section):
return return
self.values = OrderedDict() self.values = OrderedDict()
for (k, v, desc) in defaults: for (k, v, desc) in defaults:
assert k not in self.values, k
self.values[k] = v self.values[k] = v
self.descriptions[k] = desc self.descriptions[k] = desc
@ -160,11 +161,14 @@ class ValueList(Section):
self.keytype = keytype self.keytype = keytype
self.valtype = valtype self.valtype = valtype
self.layers = OrderedDict([ self.layers = OrderedDict([
('default', OrderedDict([(key, SettingValue(valtype, value)) ('default', OrderedDict()),
for key, value in defaults])),
('conf', OrderedDict()), ('conf', OrderedDict()),
('temp', 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.values = ChainMap(self.layers['temp'], self.layers['conf'],
self.layers['default']) self.layers['default'])