summaryrefslogtreecommitdiffstats
path: root/Reaktor/IRC/getconf.py
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2014-04-27 18:17:23 +0200
committermakefu <github@syntax-fehler.de>2014-04-27 18:17:23 +0200
commitaa4b1772353ddf520b210bb1a692ce1b604cba23 (patch)
tree416bf15d2c7a49542b53b805dd6a155e05735cf1 /Reaktor/IRC/getconf.py
parentadffcc9053665c52029cb96746ce28d9f334d18a (diff)
parent11a8e061d7b96df22c4793cbbd79cb8dba686513 (diff)
Merge branch 'master' of ssh://github.com/krebscode/painload
Diffstat (limited to 'Reaktor/IRC/getconf.py')
-rw-r--r--Reaktor/IRC/getconf.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Reaktor/IRC/getconf.py b/Reaktor/IRC/getconf.py
index f9cd4404..168c908c 100644
--- a/Reaktor/IRC/getconf.py
+++ b/Reaktor/IRC/getconf.py
@@ -9,14 +9,17 @@ import os
def make_getconf(filename):
- def getconf(prop):
+ def getconf(prop, default_value=None):
prop_split = prop.split('.')
string = ''
config = load_config(filename)
#imp.reload(config)
tmp = config.__dict__
for pr in prop_split:
- tmp = tmp[pr]
+ if pr in tmp:
+ tmp = tmp[pr]
+ else:
+ return default_value
return tmp
return getconf