From c4da44e90c9619802a54eaa26310e0d3eab9d505 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 14 Nov 2014 08:31:47 +0100 Subject: [PATCH] configtypes: Handle none_ok differently for List. --- qutebrowser/config/configtypes.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py index b33e56aac..3c1a027e5 100644 --- a/qutebrowser/config/configtypes.py +++ b/qutebrowser/config/configtypes.py @@ -216,15 +216,20 @@ class List(BaseType): typestr = 'string-list' def transform(self, value): - return [v if v else None for v in value.split(',')] + if not value: + return None + else: + return [v if v else None for v in value.split(',')] def validate(self, value): + if not value: + if self._none_ok: + return + else: + raise ValidationError(value, "list may not be empty!") vals = self.transform(value) if None in vals: - if self._none_ok: - pass - else: - raise ValidationError(value, "items may not be empty!") + raise ValidationError(value, "items may not be empty!") class Bool(BaseType):