From 544f137c64a8a7e1337ea93fa167f1d46d38bd8a Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Thu, 18 Mar 2021 19:56:10 +0100 Subject: [PATCH] Anonymous: Simplify/modernize @internationalizeDocstring and var setting in test. --- plugins/Anonymous/plugin.py | 2 -- plugins/Anonymous/test.py | 29 +++++++++-------------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/plugins/Anonymous/plugin.py b/plugins/Anonymous/plugin.py index 6e7da8dff..76b379a65 100644 --- a/plugins/Anonymous/plugin.py +++ b/plugins/Anonymous/plugin.py @@ -78,7 +78,6 @@ class Anonymous(callbacks.Plugin): irc.error(_('This command is disabled (supybot.plugins.Anonymous.' 'allowPrivateTarget is False).'), Raise=True) - @internationalizeDocstring def say(self, irc, msg, args, target, text): """ @@ -104,7 +103,6 @@ class Anonymous(callbacks.Plugin): irc.noReply() tell = wrap(tell, ['nick', 'text']) - @internationalizeDocstring def do(self, irc, msg, args, channel, text): """ diff --git a/plugins/Anonymous/test.py b/plugins/Anonymous/test.py index 2867f46d6..222352ed5 100644 --- a/plugins/Anonymous/test.py +++ b/plugins/Anonymous/test.py @@ -34,38 +34,27 @@ class AnonymousTestCase(ChannelPluginTestCase): plugins = ('Anonymous',) def testSay(self): self.assertError('anonymous say %s I love you!' % self.channel) - origreg = conf.supybot.plugins.Anonymous.requireRegistration() - try: - conf.supybot.plugins.Anonymous.requireRegistration.setValue(False) + + with conf.supybot.plugins.Anonymous.requireRegistration.context(False): m = self.assertNotError('anonymous say %s foo!' % self.channel) self.assertTrue(m.args[1] == 'foo!') - finally: - conf.supybot.plugins.Anonymous.requireRegistration.setValue(origreg) def testTell(self): self.assertError('anonymous tell %s I love you!' % self.nick) - origreg = conf.supybot.plugins.Anonymous.requireRegistration() - origpriv = conf.supybot.plugins.Anonymous.allowPrivateTarget() - try: - conf.supybot.plugins.Anonymous.requireRegistration.setValue(False) + + with conf.supybot.plugins.Anonymous.requireRegistration.context(False): self.assertError('anonymous tell %s foo!' % self.channel) - conf.supybot.plugins.Anonymous.allowPrivateTarget.setValue(True) - m = self.assertNotError('anonymous tell %s foo!' % self.nick) - self.assertTrue(m.args[1] == 'foo!') - finally: - conf.supybot.plugins.Anonymous.requireRegistration.setValue(origreg) - conf.supybot.plugins.Anonymous.allowPrivateTarget.setValue(origpriv) + with conf.supybot.plugins.Anonymous.allowPrivateTarget.context(True): + m = self.assertNotError('anonymous tell %s foo!' % self.nick) + self.assertTrue(m.args[1] == 'foo!') def testAction(self): m = self.assertError('anonymous do %s loves you!' % self.channel) - try: - orig = conf.supybot.plugins.Anonymous.requireRegistration() - conf.supybot.plugins.Anonymous.requireRegistration.setValue(False) + + with conf.supybot.plugins.Anonymous.requireRegistration.context(False): m = self.assertNotError('anonymous do %s loves you!'%self.channel) self.assertEqual(m.args, ircmsgs.action(self.channel, 'loves you!').args) - finally: - conf.supybot.plugins.Anonymous.requireRegistration.setValue(orig) # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: