fix realtarget bug

[erebus.git] / modules / eval.py

diff --git a/modules/eval.py b/modules/eval.py
index d248b5396b4f16c35aa828c42964fa03c5ca198c..1c68b925d7aea02df7444aa9f31356483a8a9349 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -27,22 +27,20 @@ def module(name):
 @lib.hook('eval', needchan=False, glevel=lib.MANAGER)
 @lib.argsGE(1)
 def cmd_eval(bot, user, chan, realtarget, *args):
-       if realtarget == chan.name: 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]))
+       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.argsGE(1)
 def cmd_exec(bot, user, chan, realtarget, *args):
-       if realtarget == chan.name: 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.")