From e386518997b0d5fd8846f5dde4b939ed369ba623 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Tue, 9 Sep 2003 07:57:49 +0000 Subject: [PATCH] Fixed escaping KeyError and added test. --- plugins/ChannelDB.py | 2 +- test/test_ChannelDB.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/ChannelDB.py b/plugins/ChannelDB.py index e53ce3bc3..ccb0944b0 100644 --- a/plugins/ChannelDB.py +++ b/plugins/ChannelDB.py @@ -276,8 +276,8 @@ class ChannelDB(callbacks.PrivmsgCommandAndRegexp, ChannelDBHandler): channel = privmsgs.getChannel(msg, args) name = privmsgs.getArgs(args) if not ircdb.users.hasUser(name): - hostmask = irc.state.nickToHostmask(name) try: + hostmask = irc.state.nickToHostmask(name) name = ircdb.users.getUserName(hostmask) except KeyError: irc.error(msg, conf.replyNoUser) diff --git a/test/test_ChannelDB.py b/test/test_ChannelDB.py index a9b76349f..f582e4d63 100644 --- a/test/test_ChannelDB.py +++ b/test/test_ChannelDB.py @@ -38,6 +38,10 @@ class ChannelDBTestCase(ChannelPluginTestCase, PluginDocumentation): self.assertNotError('channelstats') self.assertNotError('channelstats') + def testNoKeyErrorEscapeFromSeen(self): + self.assertRegexp('seen asldfkjasdlfkj', conf.replyNoUser) + self.assertNotRegexp('seen asldfkjasdlfkj', 'KeyError') + # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: