From 159ec790e8fb0870f07a245bc36342feb57f22aa Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Sat, 11 Feb 2012 14:41:05 +0100 Subject: Set the return value for "no setting" to None, not an arbitrary default value --- pykolab/conf/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py index 8010948..e6db94e 100644 --- a/pykolab/conf/__init__.py +++ b/pykolab/conf/__init__.py @@ -463,12 +463,12 @@ class Conf(object): setting = self.get_raw(section, key) if setting == None: - return self.defaults.address_search_attrs + return None raw_values = setting.split(',') if raw_values == None: - return self.defaults.address_search_attrs + return None for raw_value in raw_values: untrimmed_values.extend(raw_value.split(' ')) -- cgit v1.1