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

configtypes: Handle empty values in ConfirmQuit

Browse Source
This commit is contained in:
Florian Bruhin 2015-07-24 00:24:04 +02:00
parent b3755f4ca1
commit 730a8afc6b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/config/configtypes.py
View File

@ -1405,15 +1405,24 @@ class ConfirmQuit(List):
combinable_values = ('multiple-tabs', 'downloads') combinable_values = ('multiple-tabs', 'downloads')
def validate(self, value): def validate(self, value):
values = self.transform(value)
if not value: if not value:
if self.none_ok: if self.none_ok:
return None return None
else: else:
raise configexc.ValidationError( raise configexc.ValidationError(
value, "Value may not be empty!") value, "Value may not be empty!")
values = []
for v in self.transform(value):
if v:
values.append(v)
elif self.none_ok:
pass
else:
raise configexc.ValidationError(value, "May not contain empty "
"values!")
# Never can't be set with other options # Never can't be set with other options
elif 'never' in values and len(values) > 1: if 'never' in values and len(values) > 1:
raise configexc.ValidationError( raise configexc.ValidationError(
value, "List cannot contain never!") value, "List cannot contain never!")
# Always can't be set with other options # Always can't be set with other options