From 3e9359941994f55d33702c15a83a84b12da1531d Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Fri, 9 Jan 2004 14:20:00 +0000 Subject: [PATCH] Fixed bugz0r in errorNoCapability. --- src/callbacks.py | 3 ++- test/test_callbacks.py | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/callbacks.py b/src/callbacks.py index e3e9e5e7d..ec5b1417c 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -303,7 +303,8 @@ class RichReplyMethods(object): self.reply(self._makeReply(conf.replyError, s), **kwargs) def errorNoCapability(self, capability, s='', **kwargs): - self.error(self._makeReply(conf.replyNoCapability % s, s), **kwargs) + s = self._makeReply(conf.replyNoCapability % capability, s) + self.error(s, **kwargs) def errorPossibleBug(self, s='', **kwargs): if s: diff --git a/test/test_callbacks.py b/test/test_callbacks.py index 2456381ff..df2b634a5 100644 --- a/test/test_callbacks.py +++ b/test/test_callbacks.py @@ -376,5 +376,12 @@ class PrivmsgCommandAndRegexpTestCase(PluginTestCase): self.irc.addCallback(self.PCAR()) self.assertResponse('test', 'test ') +class RichReplyMethodsTestCase(unittest.TestCase): + def testErrorNoCapability(self): + class NoCapability(callbacks.RichReplyMethods): + def error(self, s, **kwargs): + assert 'admin' in s + x = NoCapability() + x.errorNoCapability('admin') # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: