diff options
| author | makefu <github@syntax-fehler.de> | 2015-08-28 13:53:25 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-08-28 13:53:25 +0200 |
| commit | 15026716ab3057998cf2f487742c2dd8e185335c (patch) | |
| tree | 8490997c5f426aba8ec35c18f65cda8965cffbce | |
| parent | c4d5f80b839d8969e99087268fe40e8ac723c629 (diff) | |
Reaktor: cleanup
| -rw-r--r-- | reaktor/getconf.py | 15 | ||||
| -rw-r--r-- | reaktor/ircasy.py | 6 |
2 files changed, 8 insertions, 13 deletions
diff --git a/reaktor/getconf.py b/reaktor/getconf.py index 168c908..e513e31 100644 --- a/reaktor/getconf.py +++ b/reaktor/getconf.py @@ -1,14 +1,12 @@ -#getconf = make_getconf("dateiname.json") -#getconf(key) -> value -#oder error +#getconf = make_getconf("dateiname.json") +#getconf(key) -> value +#oder error import imp import os def make_getconf(filename): - - def getconf(prop, default_value=None): prop_split = prop.split('.') string = '' @@ -29,5 +27,8 @@ def load_config(filename): dirname = os.path.dirname(filename) modname, ext = os.path.splitext(os.path.basename(filename)) file, pathname, description = imp.find_module(modname, [ dirname ]) - return imp.load_module(modname, file, pathname, description) - + try: + ret = imp.load_module(modname, file, pathname, description) + finally: + if file: file.close() + return ret diff --git a/reaktor/ircasy.py b/reaktor/ircasy.py index 38f202f..bb9028a 100644 --- a/reaktor/ircasy.py +++ b/reaktor/ircasy.py @@ -22,12 +22,6 @@ class asybot(asychat): asychat.__init__(self) #logger magic self.log = logging.getLogger('asybot_' + nickname) - #hdlr = logging.handlers.SysLogHandler(facility=logging.handlers.SysLogHandler.LOG_DAEMON) - #formatter = logging.Formatter( '%(filename)s: %(levelname)s: %(message)s') - #hdlr.setFormatter(formatter) - #self.log.addHandler(hdlr) - logging.basicConfig(level = loglevel) - self.nickname = nickname if realname: |