diff --git a/plugins/Amazon.py b/plugins/Amazon.py index 4d0e5cbfa..475f7f013 100644 --- a/plugins/Amazon.py +++ b/plugins/Amazon.py @@ -83,9 +83,6 @@ conf.registerGlobalValue(conf.supybot.plugins.Amazon, 'licenseKey', class Amazon(callbacks.Privmsg): threaded = True - def __init__(self): - callbacks.Privmsg.__init__(self) - def _genResults(self, reply, attribs, items, url, bold, bold_item): results = {} res = [] diff --git a/plugins/Dict.py b/plugins/Dict.py index fd85895fc..2bb9b2958 100644 --- a/plugins/Dict.py +++ b/plugins/Dict.py @@ -70,12 +70,6 @@ conf.registerGlobalValue(conf.supybot.plugins.Dict, 'server', class Dict(callbacks.Privmsg): threaded = True - def __init__(self): - callbacks.Privmsg.__init__(self) - - def die(self): - callbacks.Privmsg.die(self) - def dictionaries(self, irc, msg, args): """takes no arguments. diff --git a/plugins/Ebay.py b/plugins/Ebay.py index dc9f6d52e..4340b62dc 100644 --- a/plugins/Ebay.py +++ b/plugins/Ebay.py @@ -81,11 +81,6 @@ class Ebay(callbacks.PrivmsgCommandAndRegexp): """ threaded = True regexps = ['ebaySnarfer'] - def __init__(self): - callbacks.PrivmsgCommandAndRegexp.__init__(self) - - def die(self): - callbacks.PrivmsgCommandAndRegexp.die(self) _reopts = re.I | re.S _invalid = re.compile(r'(is invalid, still pending, or no longer in our ' diff --git a/plugins/Gameknot.py b/plugins/Gameknot.py index 3ec6f07b9..c86dc56be 100644 --- a/plugins/Gameknot.py +++ b/plugins/Gameknot.py @@ -89,12 +89,7 @@ class Gameknot(callbacks.PrivmsgCommandAndRegexp): r'"#FFFF00">(\d+)') _gkteam = re.compile(r'Team:(<.*?>)+(?P.*?)') _gkseen = re.compile(r'(seen on GK:\s+([^[]+ago)|.*?is hiding.*?)') - def __init__(self): - callbacks.PrivmsgCommandAndRegexp.__init__(self) - def die(self): - callbacks.PrivmsgCommandAndRegexp.die(self) - def getStats(self, name): gkprofile = 'http://www.gameknot.com/stats.pl?%s' % name try: diff --git a/plugins/Google.py b/plugins/Google.py index 40846333f..2154c43a7 100644 --- a/plugins/Google.py +++ b/plugins/Google.py @@ -172,9 +172,6 @@ class Google(callbacks.PrivmsgCommandAndRegexp): self.totalTime = 0 self.last24hours = structures.queue() - def die(self): - callbacks.PrivmsgCommandAndRegexp.die(self) - def formatData(self, data, bold=True, max=0): if isinstance(data, basestring): return data diff --git a/plugins/Sourceforge.py b/plugins/Sourceforge.py index dc367f6ac..b7479b71e 100644 --- a/plugins/Sourceforge.py +++ b/plugins/Sourceforge.py @@ -127,11 +127,6 @@ class Sourceforge(callbacks.PrivmsgCommandAndRegexp): _statusOpt = {'any':100, 'open':1, 'closed':2, 'deleted':3, 'pending':4} _projectURL = 'http://sourceforge.net/projects/' - def __init__(self): - callbacks.PrivmsgCommandAndRegexp.__init__(self) - - def die(self): - callbacks.PrivmsgCommandAndRegexp.die(self) def _formatResp(self, text, num=''): """