diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py index cd44ec15c..cee3fbfae 100644 --- a/plugins/Owner/plugin.py +++ b/plugins/Owner/plugin.py @@ -82,7 +82,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 canonized.' + 'newName must already be normalized.' 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 ae0efb0cd..9f5a4d591 100644 --- a/plugins/RSS/plugin.py +++ b/plugins/RSS/plugin.py @@ -174,11 +174,11 @@ class RSS(callbacks.Plugin): 'Unable to download feed.'): self.log.debug('%s %u', s, url) return - def canonize(headline): + def normalize(headline): return (tuple(headline[0].lower().split()), headline[1]) - oldheadlines = set(map(canonize, oldheadlines)) + oldheadlines = set(map(normalize, oldheadlines)) for (i, headline) in enumerate(newheadlines): - if canonize(headline) in oldheadlines: + if normalize(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 4c5b268ef..8b1948f33 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -1078,7 +1078,7 @@ class Commands(BasePlugin): # 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 canonize this name: consider outFilter(self, irc, msg). + # Don't normalize this name: consider outFilter(self, irc, msg). # name = canonicalName(name) if self.isDisabled(name): return False