added helper function to eval module

[erebus.git] / modules / eval.py

diff --git a/modules/eval.py b/modules/eval.py
index 9ad387ca7ba37c8aaf6c1c8cc93e471345af3856..61344688479301ec66e2f294f6c351efbbe468a2 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -1,9 +1,10 @@
-# Erebus IRC bot - Author: John Runyon
+# Erebus IRC bot - Author: Erebus Team
 # !EVAL and !EXEC commands
+# This file is released into the public domain; see http://unlicense.org/
 
 # module info
 modinfo = {
-       'author': 'John Runyon (DimeCadmium)',
+       'author': 'Erebus Team',
        'license': 'public domain',
        'compatible': [1],
        'depends': [],
@@ -17,23 +18,31 @@ modstop = lib.modstop
 
 # module code
 import sys
+import ctlmod
 
 
+def module(name):
+       return lib.parent.module(name)
+
 @lib.hook('eval', needchan=False, glevel=lib.MANAGER)
-def cmd_eval(bot, user, chan, *args):
+@lib.argsGE(1)
+def cmd_eval(bot, user, chan, realtarget, *args):
        if chan is not None: 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))
+       else: bot.msg(replyto, "Done: %r" % (ret,))
 
 
 @lib.hook('exec', needchan=False, glevel=lib.MANAGER)
-def cmd_exec(bot, user, chan, *args):
+@lib.argsGE(1)
+def cmd_exec(bot, user, chan, realtarget, *args):
        if chan is not None: 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]))
        else: bot.msg(replyto, "Done.")