update encoding

[erebus.git] / modules / eval.py

diff --git a/modules/eval.py b/modules/eval.py
index 1c68b925d7aea02df7444aa9f31356483a8a9349..00f37ebd71e592fbe07faf4f35bd7ded5a2b8ed9 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -1,4 +1,5 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # !EVAL and !EXEC commands
 # This file is released into the public domain; see http://unlicense.org/
 
@@ -6,8 +7,9 @@
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1],
+       'compatible': [0],
        'depends': [],
+       'softdeps': ['help'],
 }
 
 # preamble
@@ -22,12 +24,13 @@ import ctlmod
 
 
 def module(name):
-       return lib.parent.module(name)
+       return lib.mod(name)
 
-@lib.hook('eval', needchan=False, glevel=lib.MANAGER)
+@lib.hook('eval', needchan=False, wantchan=True, glevel=lib.OWNER)
+@lib.help("<python>", "eval")
 @lib.argsGE(1)
 def cmd_eval(bot, user, chan, realtarget, *args):
-       if chan is not None and realtarget == chan.name: replyto = chan
+       if chan is not None: replyto = chan
        else: replyto = user
 
        try: ret = eval(' '.join(args))
@@ -35,12 +38,18 @@ def cmd_eval(bot, user, chan, realtarget, *args):
        else: bot.msg(replyto, "Done: %r" % (ret,))
 
 
-@lib.hook('exec', needchan=False, glevel=lib.MANAGER)
+@lib.hook('exec', needchan=False, wantchan=True, glevel=lib.OWNER)
+@lib.help("<python>", "exec")
 @lib.argsGE(1)
 def cmd_exec(bot, user, chan, realtarget, *args):
-       if chan is not None and realtarget == chan.name: replyto = chan
+       if chan is not None: replyto = chan
        else: replyto = user
 
-       try: exec ' '.join(args)
+       try: exec(' '.join(args))
        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()