aboutsummaryrefslogtreecommitdiffstats
path: root/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
commit8d4c5b69c6d7bb9774b49f68db6570ebd2681505 (patch)
treee2c19554f5d1702eb0856d82f691cfce610f3a39 /IRC/getconf.py
parentc7e714ff331761a3c50d47e3b5a4834de92c2adc (diff)
parent97e2b11759fe3066b3d12bb9d47c981959c3cde8 (diff)
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'IRC/getconf.py')
-rw-r--r--IRC/getconf.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/IRC/getconf.py b/IRC/getconf.py
index f9cd440..168c908 100644
--- a/IRC/getconf.py
+++ b/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