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

Refactor ValueList

Browse Source
This commit is contained in:
Florian Bruhin 2014-04-10 12:09:32 +02:00
parent 21e628a1ba
commit c05e66a9b9
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/config/conftypes.py
View File

@ -70,7 +70,7 @@ class SettingValue:
""" """
def __init__(self, typ, default): def __init__(self, typ, default=None):
"""Constructor. """Constructor.
Args: Args:

21
qutebrowser/config/sections.py
View File

@ -113,7 +113,8 @@ class ValueList:
Attributes: Attributes:
values: An OrderedDict with key as index and value as value. values: An OrderedDict with key as index and value as value.
default: An OrderedDict with the default configuration as strings. default: An OrderedDict with the default configuration as strings.
types: A tuple for (keytype, valuetype) keytype: The type to use for the key (only used for validating)
valtype: The type to use for the value.
valdict: The "true value" dict. valdict: The "true value" dict.
#descriptions: A dict with the description strings for the keys. #descriptions: A dict with the description strings for the keys.
# Currently a global empty dict to be compatible with # Currently a global empty dict to be compatible with
@ -121,14 +122,10 @@ class ValueList:
""" """
values = None
default = None
types = None
#descriptions = {}
def __init__(self, keytype, valtype, *defaults): def __init__(self, keytype, valtype, *defaults):
"""Wrap types over default values. Take care when overriding this.""" """Wrap types over default values. Take care when overriding this."""
self.types = (keytype, valtype) self.keytype = keytype
self.valtype = valtype
self.values = OrderedDict() self.values = OrderedDict()
self.default = OrderedDict( self.default = OrderedDict(
[(key, conftypes.SettingValue(valtype, value)) [(key, conftypes.SettingValue(valtype, value))
@ -165,8 +162,8 @@ class ValueList:
value: The value to set, as a string value: The value to set, as a string
""" """
valtype = self.types[1] self.values[key] = conftypes.SettingValue(self.valtype)
self.values[key] = conftypes.SettingValue(valtype, value) self.values[key].value = value
def __iter__(self): def __iter__(self):
"""Iterate over all set values.""" """Iterate over all set values."""
@ -191,9 +188,9 @@ class ValueList:
def from_cp(self, sect): def from_cp(self, sect):
"""Initialize the values from a configparser section.""" """Initialize the values from a configparser section."""
keytype = self.types[0]() keytype = self.keytype()
valtype = self.types[1]() valtype = self.valtype()
for k, v in sect.items(): for k, v in sect.items():
keytype.validate(k) keytype.validate(k)
valtype.validate(v) valtype.validate(v)
self.values[k] = conftypes.SettingValue(self.types[1], v) self.values[k] = conftypes.SettingValue(self.valtype, v)