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

Change namedtuple to OrderedDict for conflayers

Browse Source
This commit is contained in:
Florian Bruhin 2014-04-11 17:49:15 +02:00
parent e7c23312d7
commit b0792203a5
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/config/sections.py
View File

@ -90,7 +90,7 @@ class KeyValue:
Arguments:
layer: The layer to set the value on, an element name of the
ValueLayers namedtuple.
ValueLayers dict.
key: The key of the element to set.
value: The value to set.
"""
@ -195,7 +195,7 @@ class ValueList:
Arguments:
layer: The layer to set the value on, an element name of the
ValueLayers namedtuple.
ValueLayers dict.
key: The key of the element to set.
value: The value to set.
"""

17
qutebrowser/config/value.py
View File

@ -17,9 +17,7 @@
"""A single value (with multiple layers possibly) in the config."""
from collections import namedtuple
ValueLayers = namedtuple('ValueLayers', 'temp, conf, default')
from collections import OrderedDict
class SettingValue:
@ -31,7 +29,7 @@ class SettingValue:
Attributes:
typ: A BaseType subclass.
value: (readonly property) The currently valid, most important value.
_values: A namedtuple with the values on different layers, with the
_values: An OrderedDict with the values on different layers, with the
most significant layer first.
"""
@ -43,8 +41,9 @@ class SettingValue:
default: Raw value to set.
"""
self.typ = typ()
self._values = ValueLayers(None, None, None)
self._values.default = default
self._values = OrderedDict.fromkeys(['temp', 'conf', 'default'])
self._values['default'] = default
def __str__(self):
"""Get raw string value."""
@ -53,7 +52,7 @@ class SettingValue:
@property
def value(self):
"""Get the currently valid value."""
for val in self._values:
for val in self._values.values():
if val is not None:
return val
else:
@ -74,8 +73,8 @@ class SettingValue:
Arguments:
layer: The layer to set the value on, an element name of the
ValueLayers namedtuple.
ValueLayers dict.
value: The value to set.
"""
self.typ.validate(value)
setattr(self._values, layer, value)
self._values[layer] = value