diff --git a/plugins/Admin/test.py b/plugins/Admin/test.py index cd6cb65be..3b0476f37 100644 --- a/plugins/Admin/test.py +++ b/plugins/Admin/test.py @@ -95,7 +95,6 @@ class AdminTestCase(PluginTestCase): self.assertEqual(m.args[1], 'key') def testNick(self): - original = conf.supybot.nick() try: m = self.getMsg('nick foobar') self.assertEqual(m.command, 'NICK') diff --git a/plugins/Services/config.py b/plugins/Services/config.py index f41d91045..b55bbdc89 100644 --- a/plugins/Services/config.py +++ b/plugins/Services/config.py @@ -31,7 +31,7 @@ import supybot.conf as conf import supybot.ircutils as ircutils import supybot.registry as registry -from supybot.i18n import PluginInternationalization, internationalizeDocstring +from supybot.i18n import PluginInternationalization _ = PluginInternationalization('Services') def registerNick(nick, password=''): @@ -44,7 +44,7 @@ def registerNick(nick, password=''): v.setValue(password) def configure(advanced): - from supybot.questions import expect, anything, something, yn, getpass + from supybot.questions import something conf.registerPlugin('Services', True) nick = something(_('What is your registered nick?')) password = something(_('What is your password for that nick?')) diff --git a/plugins/Services/plugin.py b/plugins/Services/plugin.py index ca22d83ee..6853d8988 100644 --- a/plugins/Services/plugin.py +++ b/plugins/Services/plugin.py @@ -38,7 +38,6 @@ import supybot.utils as utils from supybot.commands import * import supybot.ircmsgs as ircmsgs import supybot.ircutils as ircutils -import supybot.schedule as schedule import supybot.callbacks as callbacks from supybot.i18n import PluginInternationalization, internationalizeDocstring _ = PluginInternationalization('Services') diff --git a/src/irclib.py b/src/irclib.py index aed9fc824..b24c5dbdf 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -1564,7 +1564,6 @@ class Irc(IrcCommandDispatcher, log.Firewalled): received* tags.""" if tag: self._tagMsg(msg) - channel = msg.channel preInFilter = str(msg).rstrip('\r\n') log.debug('Incoming message (%s): %s', self.network, preInFilter)