diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py index 0e56e11ca..db33b8988 100644 --- a/plugins/Owner/plugin.py +++ b/plugins/Owner/plugin.py @@ -75,7 +75,7 @@ def registerRename(plugin, command=None, newName=None): def renameCommand(cb, name, newName): assert not hasattr(cb, newName), 'Cannot rename over existing attributes.' assert newName == callbacks.canonicalName(newName), \ - 'newName must already be canonicalized.' + 'newName must already be canonized.' if name != newName: method = getattr(cb.__class__, name) setattr(cb.__class__, newName, method) diff --git a/plugins/RSS/plugin.py b/plugins/RSS/plugin.py index 7a72cda24..c79cb39ec 100644 --- a/plugins/RSS/plugin.py +++ b/plugins/RSS/plugin.py @@ -141,11 +141,11 @@ class RSS(callbacks.Privmsg): oldheadlines = [] newresults = self.getFeed(url) newheadlines = self.getHeadlines(newresults) - def canonicalize(headline): + def canonize(headline): return (tuple(headline[0].lower().split()), headline[1]) - oldheadlines = set(map(canonicalize, oldheadlines)) + oldheadlines = set(map(canonize, oldheadlines)) for (i, headline) in enumerate(newheadlines): - if canonicalize(headline) in oldheadlines: + if canonize(headline) in oldheadlines: newheadlines[i] = None newheadlines = filter(None, newheadlines) # Removes Nones. if newheadlines: diff --git a/src/callbacks.py b/src/callbacks.py index 739e8e68e..c7e5070c1 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -1099,7 +1099,7 @@ class Privmsg(irclib.IrcCallback): # This function is ugly, but I don't want users to call methods like # doPrivmsg or __init__ or whatever, and this is good to stop them. - # Don't canonicalize this name: consider outFilter(self, irc, msg). + # Don't canonize this name: consider outFilter(self, irc, msg). # name = canonicalName(name) if self.isDisabled(name): return False