diff options
author | Sean B. Palmer <http://inamidst.com/sbp/> | 2008-02-23 12:16:43 +0000 |
---|---|---|
committer | Sean B. Palmer <http://inamidst.com/sbp/> | 2008-02-23 12:16:43 +0000 |
commit | 2fb00589439a4efb3906d4e681e7ed815dcd180a (patch) | |
tree | 0a6b0ff1a4b5697fc7c3cb0aa3dc934246fcb874 /modules/reload.py | |
parent | 7931fab14599b739c18c8f1ebcc24b75688dbc09 (diff) | |
download | bot-2fb00589439a4efb3906d4e681e7ed815dcd180a.tar.gz bot-2fb00589439a4efb3906d4e681e7ed815dcd180a.tar.bz2 bot-2fb00589439a4efb3906d4e681e7ed815dcd180a.zip |
Lots of fixes, changes, and new goodies.
Diffstat (limited to 'modules/reload.py')
-rwxr-xr-x | modules/reload.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/reload.py b/modules/reload.py index 257eaf7..7a4c76f 100755 --- a/modules/reload.py +++ b/modules/reload.py @@ -13,8 +13,10 @@ def f_reload(phenny, input): """Reloads a module, for use by admins only.""" if not input.admin: return - name = match.group(2) - module = getattr(__import__('modules.' + name), name) + name = input.group(2) + try: module = getattr(__import__('modules.' + name), name) + except ImportError: + module = getattr(__import__('opt.' + name), name) reload(module) if hasattr(module, '__file__'): @@ -23,8 +25,8 @@ def f_reload(phenny, input): modified = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(mtime)) else: modified = 'unknown' - self.register(vars(module)) - self.bind_commands() + phenny.register(vars(module)) + phenny.bind_commands() phenny.reply('%r (version: %s)' % (module, modified)) f_reload.name = 'reload' |