summaryrefslogtreecommitdiffstats
path: root/Reaktor/IRC/getconf.py
diff options
context:
space:
mode:
authormakefu <root@pigstarter.de>2014-04-25 13:38:18 +0200
committermakefu <root@pigstarter.de>2014-04-25 13:38:18 +0200
commit8070f4a259cc02983ca7d3c8e86cb8da816a5c3b (patch)
tree9785c0db5c0b0f88c2f2eecf476eb1c7b22c56a6 /Reaktor/IRC/getconf.py
parentc35d7c4e017baa57c14f1fb4b48f18e153ced549 (diff)
parent7bf0b790b95d97d33e57a4e52cf7681bc6366d98 (diff)
Merge branch 'master' of https://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