From c31167ed3f81922345adee9e067fa163c95da75e Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Wed, 2 Apr 2003 07:42:07 +0000
Subject: [PATCH] Stopped catching exceptions in the wrong place in
 callCommand.

---
 src/callbacks.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/callbacks.py b/src/callbacks.py
index 5804bb338..6885416cf 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -346,11 +346,9 @@ class Privmsg(irclib.IrcCallback):
             thread.start()
             debug.printf('Spawned new thread: %s' % thread)
         else:
-            try:
-                f(irc, msg, args)
-            except Exception, e:
-                debug.recoverableException()
-                irc.error(msg, debug.exnToString(e))
+            # Exceptions aren't caught here because IrcObjectProxy.finalEval
+            # catches them and does The Right Thing.
+            f(irc, msg, args)
 
     _r = re.compile(r'^(\S+)')
     def doPrivmsg(self, irc, msg):