X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/4df64299d7751fb90a9cf5e2964e9bcc365bcc3e..a865743922e1bfad987e69bc421fb2b2cae70c2d:/modules/eval.py

diff --git a/modules/eval.py b/modules/eval.py
index d248b53..d9ff4e4 100644
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -22,27 +22,25 @@ import ctlmod
 
 
 def module(name):
-	return lib.parent.module(name)
+	return lib.mod(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.")