msg module

[erebus.git] / modules / eval.py

diff --git a/modules/eval.py b/modules/eval.py
index 795c72a96376834c6172e11ce6b6750f41cb6b10..d2b82c83567e2005d5936e8d714b8139790b72d0 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -6,8 +6,9 @@
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1],
+       'compatible': [1,2],
        'depends': [],
+       'softdeps': ['help'],
 }
 
 # preamble
@@ -18,26 +19,36 @@ modstop = lib.modstop
 
 # module code
 import sys
+import ctlmod
+
+
+def module(name):
+       return lib.mod(name)
 
 @lib.hook('eval', needchan=False, glevel=lib.MANAGER)
+@lib.help("<python>", "eval")
 @lib.argsGE(1)
 def cmd_eval(bot, user, chan, realtarget, *args):
-       if chan is not None: replyto = chan
+       if chan is not None and realtarget == chan.name: replyto = chan
        else: replyto = user
 
        try: ret = eval(' '.join(args))
-       except SystemExit: raise
-       except: bot.msg(replyto, "Error (%s): %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-       else: bot.msg(replyto, "Done: %r" % (ret))
+       except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+       else: bot.msg(replyto, "Done: %r" % (ret,))
 
 
 @lib.hook('exec', needchan=False, glevel=lib.MANAGER)
+@lib.help("<python>", "exec")
 @lib.argsGE(1)
 def cmd_exec(bot, user, chan, realtarget, *args):
-       if chan is not None: replyto = chan
+       if chan is not None and realtarget == chan.name: replyto = chan
        else: replyto = user
 
        try: exec ' '.join(args)
-       except SystemExit: raise
-       except: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+       except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
        else: bot.msg(replyto, "Done.")
+
+@lib.hook('exception', needchan=False, glevel=lib.OWNER)
+@lib.help(None, "cause an exception")
+def cmd_exception(*args, **kwargs):
+       raise Exception()