summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-02-11 14:41:05 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-02-11 14:41:05 +0100
commit159ec790e8fb0870f07a245bc36342feb57f22aa (patch)
tree2c1740886c62220a496371ad997c26edc06b2a0a
parent01efa922ba167e930ed426c610d30ff3cfd4ae6f (diff)
downloadpykolab-159ec790e8fb0870f07a245bc36342feb57f22aa.tar.gz
Set the return value for "no setting" to None, not an arbitrary default value
-rw-r--r--pykolab/conf/__init__.py4
1 files 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(' '))