diff --git a/RELNOTES b/RELNOTES index faa63730a..1e030d6f9 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,6 +1,6 @@ Version 0.83.5 -The minimum supported Python version has been bumped to 2.4. +The minimum supported Python version has been bumped to 2.6. utils.str.perlVariableSubstitute is deprecated in favor of using Python's string.Template directly. perlVariableSubstitute will be removed in a future diff --git a/docs/PLUGIN_TUTORIAL.rst b/docs/PLUGIN_TUTORIAL.rst index 3e8959786..1911ae7e2 100644 --- a/docs/PLUGIN_TUTORIAL.rst +++ b/docs/PLUGIN_TUTORIAL.rst @@ -325,7 +325,7 @@ information on using wrap check out the wrap tutorial (The astute Python programmer may note that this is very much like a decorator, and that's precisely what it is. However, we developed this before decorators existed and haven't changed the syntax due to our earlier requirement to stay compatible -with Python 2.3. As we now require Python 2.4 or greater, this may eventually +with Python 2.3. As we now require Python 2.6 or greater, this may eventually change to support work via decorators.) Now let's create a command with some arguments and see how we use those in our diff --git a/docs/conf.py b/docs/conf.py index 494d3c76e..c8135b013 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -39,7 +39,7 @@ master_doc = 'index' # General information about the project. project = u'Supybot' -copyright = u'2010, Jeremiah Fincher and James Vega' +copyright = u'2010, Jeremiah Fincher and James McCoy' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -174,7 +174,7 @@ htmlhelp_basename = 'Supybotdoc' # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ ('index', 'Supybot.tex', u'Supybot Documentation', - u'Jeremiah Fincher and James Vega', 'manual'), + u'Jeremiah Fincher and James McCoy', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of diff --git a/docs/man/supybot-adduser.1 b/docs/man/supybot-adduser.1 index 374db0678..b183e5049 100644 --- a/docs/man/supybot-adduser.1 +++ b/docs/man/supybot-adduser.1 @@ -36,7 +36,7 @@ multiple times. .IR supybot-plugin-doc (1), .IR supybot-plugin-create (1) .SH AUTHOR -This manual page was originally written by James Vega -. Permission is granted to copy, +This manual page was originally written by James McCoy +. Permission is granted to copy, distribute and/or modify this document under the terms of the Supybot license, a BSD-style license. diff --git a/docs/man/supybot-botchk.1 b/docs/man/supybot-botchk.1 index 58f964cc1..d40ad87c0 100644 --- a/docs/man/supybot-botchk.1 +++ b/docs/man/supybot-botchk.1 @@ -48,7 +48,7 @@ when (re)starting the bot. .IR supybot-plugin-doc (1), .IR supybot-plugin-create (1) .SH AUTHOR -This manual page was originally written by James Vega -. Permission is granted to copy, +This manual page was originally written by James McCoy +. Permission is granted to copy, distribute and/or modify this document under the terms of the Supybot license, a BSD-style license. diff --git a/docs/man/supybot-plugin-create.1 b/docs/man/supybot-plugin-create.1 index 53d90298d..aed4bd24c 100644 --- a/docs/man/supybot-plugin-create.1 +++ b/docs/man/supybot-plugin-create.1 @@ -37,7 +37,7 @@ Specify what real name the copyright is assigned to. .IR supybot-adduser (1), .IR supybot-plugin-doc (1) .SH AUTHOR -This manual page was originally written by James Vega -. Permission is granted to copy, +This manual page was originally written by James McCoy +. Permission is granted to copy, distribute and/or modify this document under the terms of the Supybot license, a BSD-style license. diff --git a/docs/man/supybot-plugin-doc.1 b/docs/man/supybot-plugin-doc.1 index b958d5208..857987d4b 100644 --- a/docs/man/supybot-plugin-doc.1 +++ b/docs/man/supybot-plugin-doc.1 @@ -42,7 +42,7 @@ them. .IR supybot-adduser (1), .IR supybot-plugin-create (1) .SH AUTHOR -This manual page was originally written by James Vega -. Permission is granted to copy, +This manual page was originally written by James McCoy +. Permission is granted to copy, distribute and/or modify this document under the terms of the Supybot license, a BSD-style license. diff --git a/docs/man/supybot-test.1 b/docs/man/supybot-test.1 index c647985c3..87a9dd6b1 100644 --- a/docs/man/supybot-test.1 +++ b/docs/man/supybot-test.1 @@ -45,7 +45,7 @@ Looks in the given directory for plugins and loads the tests for all of them. .IR supybot-plugin-doc (1), .IR supybot-plugin-create (1) .SH AUTHOR -This manual page was originally written by James Vega -. Permission is granted to copy, +This manual page was originally written by James McCoy +. Permission is granted to copy, distribute and/or modify this document under the terms of the Supybot license, a BSD-style license. diff --git a/docs/man/supybot-wizard.1 b/docs/man/supybot-wizard.1 index 0352250b3..64cf4e05e 100644 --- a/docs/man/supybot-wizard.1 +++ b/docs/man/supybot-wizard.1 @@ -36,7 +36,7 @@ connection. .IR supybot-plugin-doc (1), .IR supybot-plugin-create (1) .SH AUTHOR -This manual page was originally written by James Vega -. Permission is granted to copy, +This manual page was originally written by James McCoy +. Permission is granted to copy, distribute and/or modify this document under the terms of the Supybot license, a BSD-style license. diff --git a/docs/man/supybot.1 b/docs/man/supybot.1 index 08385010c..3c8e0e1fb 100644 --- a/docs/man/supybot.1 +++ b/docs/man/supybot.1 @@ -60,7 +60,7 @@ script. .IR supybot-plugin-doc (1), .IR supybot-plugin-create (1) .SH AUTHOR -This manual page was originally written by James Vega -. Permission is granted to copy, +This manual page was originally written by James McCoy +. Permission is granted to copy, distribute and/or modify this document under the terms of the Supybot license, a BSD-style license. diff --git a/plugins/Alias/plugin.py b/plugins/Alias/plugin.py index 13a122c34..1a0b39814 100644 --- a/plugins/Alias/plugin.py +++ b/plugins/Alias/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Anonymous/plugin.py b/plugins/Anonymous/plugin.py index 960132d13..e338f5d4d 100644 --- a/plugins/Anonymous/plugin.py +++ b/plugins/Anonymous/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005, Daniel DiPaolo -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Anonymous/test.py b/plugins/Anonymous/test.py index 4d2dd1575..96a570853 100644 --- a/plugins/Anonymous/test.py +++ b/plugins/Anonymous/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005, Daniel DiPaolo -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/AutoMode/plugin.py b/plugins/AutoMode/plugin.py index ed6bfe7f4..1d73d3048 100644 --- a/plugins/AutoMode/plugin.py +++ b/plugins/AutoMode/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2004, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/BadWords/plugin.py b/plugins/BadWords/plugin.py index dc84776a6..d9c24e69c 100644 --- a/plugins/BadWords/plugin.py +++ b/plugins/BadWords/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Channel/config.py b/plugins/Channel/config.py index 2e6217435..ce64a6a42 100644 --- a/plugins/Channel/config.py +++ b/plugins/Channel/config.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2004-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Channel/test.py b/plugins/Channel/test.py index f4cc8b6d6..e40bc220b 100644 --- a/plugins/Channel/test.py +++ b/plugins/Channel/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/ChannelLogger/README.txt b/plugins/ChannelLogger/README.txt index e6e26a540..b500ba012 100644 --- a/plugins/ChannelLogger/README.txt +++ b/plugins/ChannelLogger/README.txt @@ -1 +1 @@ -This plugin automaticly logs the channels where the bot is. +This plugin automatically logs the channels where the bot is. diff --git a/plugins/ChannelLogger/config.py b/plugins/ChannelLogger/config.py index 2fe5b0cb4..1cf78a869 100644 --- a/plugins/ChannelLogger/config.py +++ b/plugins/ChannelLogger/config.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/ChannelLogger/plugin.py b/plugins/ChannelLogger/plugin.py index fc1777cb2..6ee690456 100644 --- a/plugins/ChannelLogger/plugin.py +++ b/plugins/ChannelLogger/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/ChannelStats/README.txt b/plugins/ChannelStats/README.txt index 5c706ad4b..4018a2d16 100644 --- a/plugins/ChannelStats/README.txt +++ b/plugins/ChannelStats/README.txt @@ -1 +1 @@ -This plugin keeps stats of the channel and returns them with the command ChannelStats. +This plugin keeps stats of the channel and returns them with the command channelstats. diff --git a/plugins/ChannelStats/plugin.py b/plugins/ChannelStats/plugin.py index 6dc0a5520..1c096c43a 100644 --- a/plugins/ChannelStats/plugin.py +++ b/plugins/ChannelStats/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/ChannelStats/test.py b/plugins/ChannelStats/test.py index 517e190f8..0a65fb545 100644 --- a/plugins/ChannelStats/test.py +++ b/plugins/ChannelStats/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Config/plugin.py b/plugins/Config/plugin.py index 5c46c4d16..3aaa07c3f 100644 --- a/plugins/Config/plugin.py +++ b/plugins/Config/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Config/test.py b/plugins/Config/test.py index f63523c94..9fe44eb6d 100644 --- a/plugins/Config/test.py +++ b/plugins/Config/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Dict/plugin.py b/plugins/Dict/plugin.py index ca6bfb526..6913234e1 100644 --- a/plugins/Dict/plugin.py +++ b/plugins/Dict/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Factoids/config.py b/plugins/Factoids/config.py index fbf5c8421..9d02a5c23 100644 --- a/plugins/Factoids/config.py +++ b/plugins/Factoids/config.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Factoids/plugin.py b/plugins/Factoids/plugin.py index 8123867e0..5bc9c4ae2 100644 --- a/plugins/Factoids/plugin.py +++ b/plugins/Factoids/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Factoids/test.py b/plugins/Factoids/test.py index 035e4efed..d41c573e3 100644 --- a/plugins/Factoids/test.py +++ b/plugins/Factoids/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Games/plugin.py b/plugins/Games/plugin.py index 22a1e07b7..7ab02bb79 100644 --- a/plugins/Games/plugin.py +++ b/plugins/Games/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2003-2005, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Google/config.py b/plugins/Google/config.py index 2967c6ddf..caa88f317 100644 --- a/plugins/Google/config.py +++ b/plugins/Google/config.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005, Jeremiah Fincher -# Copyright (c) 2008-2010, James Vega +# Copyright (c) 2008-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Google/plugin.py b/plugins/Google/plugin.py index 695da8a96..064662645 100644 --- a/plugins/Google/plugin.py +++ b/plugins/Google/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2008-2010, James Vega +# Copyright (c) 2008-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -233,44 +233,6 @@ class Google(callbacks.PluginRegexp): s = ', '.join([format('%s: %i', bold(s), i) for (i, s) in results]) irc.reply(s) - @internationalizeDocstring - def translate(self, irc, msg, args, sourceLang, targetLang, text): - """ [to] - - Returns translated from into . - """ - - channel = msg.args[0] - - headers = utils.web.defaultHeaders - headers['User-Agent'] = ('Mozilla/5.0 (X11; U; Linux i686) ' - 'Gecko/20071127 Firefox/2.0.0.11') - - sourceLang = urllib.quote(sourceLang) - targetLang = urllib.quote(targetLang) - - text = urllib.quote(text) - - result = utils.web.getUrlFd('http://translate.google.com/translate_a/t' - '?client=t&hl=en&sl=%s&tl=%s&multires=1' - '&otf=1&ssel=0&tsel=0&uptl=en&sc=1&text=' - '%s' % (sourceLang, targetLang, text), - headers).read() - - while ',,' in result: - result = result.replace(',,', ',null,') - data = json.loads(result) - - try: - language = data[2] - except: - language = 'unknown' - - irc.reply(''.join(x[0] for x in data[0]), language) - - translate = wrap(translate, ['something', 'to', 'something', 'text']) - def googleSnarfer(self, irc, msg, match): r"^google\s+(.*)$" if not self.registryValue('searchSnarfer', msg.args[0]): @@ -294,70 +256,6 @@ class Google(callbacks.PluginRegexp): url = r'http://www.google.com/ig/calculator?hl=en&q=' + s return url - _calcRe1 = re.compile(r']*>(.*?)', re.I) - _calcRe2 = re.compile(r']*>(?:)?(.*?)(?:)?', re.I | re.S) - _calcSupRe = re.compile(r'(.*?)', re.I) - _calcFontRe = re.compile(r'(.*?)') - _calcTimesRe = re.compile(r'&(?:times|#215);') - @internationalizeDocstring - def calc(self, irc, msg, args, expr): - """ - - Uses Google's calculator to calculate the value of . - """ - urlig = self._googleUrlIG(expr) - js = utils.web.getUrl(urlig).decode('utf8') - # Convert JavaScript to JSON. Ouch. - js = js \ - .replace('lhs:','"lhs":') \ - .replace('rhs:','"rhs":') \ - .replace('error:','"error":') \ - .replace('icc:','"icc":') \ - .replace('\\', '\\\\') - js = json.loads(js) - - url = self._googleUrl(expr) - html = utils.web.getUrl(url).decode('utf8') - match = self._calcRe1.search(html) - if match is None: - match = self._calcRe2.search(html) - if match is not None: - s = match.group(1) - s = self._calcSupRe.sub(r'^(\1)', s) - s = self._calcFontRe.sub(r',', s) - s = self._calcTimesRe.sub(r'*', s) - s = utils.web.htmlToText(s) - if ' = ' in s: # Extra check, since the regex seems to fail. - irc.reply(s) - return - elif js['lhs'] and js['rhs']: - # Outputs the original result. Might look ugly. - irc.reply("%s = %s" % (js['lhs'], js['rhs'],)) - return - irc.reply(_('Google says: Error: %s.') % (js['error'],)) - irc.reply('Google\'s calculator didn\'t come up with anything.') - calc = wrap(calc, ['text']) - - _phoneRe = re.compile(r'Phonebook.*?(.*?) - - Looks up on Google. - """ - url = self._googleUrl(phonenumber) - html = utils.web.getUrl(url).decode('utf8') - m = self._phoneRe.search(html) - if m is not None: - s = m.group(1) - s = s.replace('', '') - s = s.replace('', '') - s = utils.web.htmlToText(s) - irc.reply(s) - else: - irc.reply(_('Google\'s phonebook didn\'t come up with anything.')) - phonebook = wrap(phonebook, ['text']) - Class = Google diff --git a/plugins/Google/test.py b/plugins/Google/test.py index 9d9495984..1aa1830ce 100644 --- a/plugins/Google/test.py +++ b/plugins/Google/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2008-2009, James Vega +# Copyright (c) 2008-2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -33,21 +33,6 @@ from supybot.test import * class GoogleTestCase(ChannelPluginTestCase): plugins = ('Google', 'Config') if network: - def testCalcHandlesMultiplicationSymbol(self): - self.assertNotRegexp('google calc seconds in a century', r'215') - - def testCalc(self): - self.assertNotRegexp('google calc e^(i*pi)+1', r'didn\'t') - self.assertNotRegexp('google calc 1 usd in gbp', r'didn\'t') - - def testHtmlHandled(self): - self.assertNotRegexp('google calc ' - 'the speed of light ' - 'in microns / fortnight', '') - self.assertNotRegexp('google calc ' - 'the speed of light ' - 'in microns / fortnight', '×') - def testSearch(self): self.assertNotError('google foo') self.assertRegexp('google dupa', r'dupa') @@ -69,7 +54,4 @@ class GoogleTestCase(ChannelPluginTestCase): self.assertRegexp('fight supybot moobot', r'.*supybot.*: \d+') self.assertNotError('fight ... !') - def testCalcDoesNotHaveExtraSpaces(self): - self.assertNotRegexp('google calc 1000^2', r'\s+,\s+') - # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: diff --git a/plugins/Internet/plugin.py b/plugins/Internet/plugin.py index d5e3083a2..ba19a5c2d 100644 --- a/plugins/Internet/plugin.py +++ b/plugins/Internet/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2003-2005, Jeremiah Fincher -# Copyright (c) 2010-2011, James Vega +# Copyright (c) 2010-2011, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Internet/test.py b/plugins/Internet/test.py index e098fdeee..0e819bc9b 100644 --- a/plugins/Internet/test.py +++ b/plugins/Internet/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2003-2005, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Karma/plugin.py b/plugins/Karma/plugin.py index 92fdd7f6c..21be42a3f 100644 --- a/plugins/Karma/plugin.py +++ b/plugins/Karma/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Later/plugin.py b/plugins/Later/plugin.py index 858ab815e..1d1394d3e 100644 --- a/plugins/Later/plugin.py +++ b/plugins/Later/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2004, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Limiter/plugin.py b/plugins/Limiter/plugin.py index b34b03319..c2a2e35a3 100644 --- a/plugins/Limiter/plugin.py +++ b/plugins/Limiter/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2004-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Math/plugin.py b/plugins/Math/plugin.py index 4491d943e..8c5bbae6f 100644 --- a/plugins/Math/plugin.py +++ b/plugins/Math/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2008-2009, James Vega +# Copyright (c) 2008-2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Math/test.py b/plugins/Math/test.py index 7dfb921e6..d37aad584 100644 --- a/plugins/Math/test.py +++ b/plugins/Math/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Misc/plugin.py b/plugins/Misc/plugin.py index 67d622fa8..64e297bca 100644 --- a/plugins/Misc/plugin.py +++ b/plugins/Misc/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Misc/test.py b/plugins/Misc/test.py index 985f001a1..f2825ecc8 100644 --- a/plugins/Misc/test.py +++ b/plugins/Misc/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Network/plugin.py b/plugins/Network/plugin.py index d1b75b7f3..236eb5811 100644 --- a/plugins/Network/plugin.py +++ b/plugins/Network/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Note/plugin.py b/plugins/Note/plugin.py index f76921a62..eb87dc1e9 100644 --- a/plugins/Note/plugin.py +++ b/plugins/Note/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2004, Brett Kelly -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py index 4c6f2ce16..cac1017f6 100644 --- a/plugins/Owner/plugin.py +++ b/plugins/Owner/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008-2009, James Vega +# Copyright (c) 2008-2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Owner/test.py b/plugins/Owner/test.py index 21847ea00..92c28fad8 100644 --- a/plugins/Owner/test.py +++ b/plugins/Owner/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Plugin/test.py b/plugins/Plugin/test.py index 75bc52a96..6417f8471 100644 --- a/plugins/Plugin/test.py +++ b/plugins/Plugin/test.py @@ -32,13 +32,13 @@ from supybot.test import * class PluginTestCase(PluginTestCase): plugins = ('Plugin', 'Utilities', 'Admin', 'Format') def testPlugin(self): - self.assertRegexp('plugin plugin', 'available.*Plugin plugin') - self.assertResponse('echo [plugin plugin]', 'Plugin') + self.assertRegexp('plugin ignore', 'available.*Utilities plugin') + self.assertResponse('echo [plugin ignore]', 'Utilities') def testPlugins(self): self.assertRegexp('plugins join', '(Format.*Admin|Admin.*Format)') self.assertRegexp('plugins plugin', 'Plugin') - + def testList(self): self.assertRegexp('plugin list', 'Plugin.*Utilities') diff --git a/plugins/QuoteGrabs/plugin.py b/plugins/QuoteGrabs/plugin.py index d63659966..b5434b61e 100644 --- a/plugins/QuoteGrabs/plugin.py +++ b/plugins/QuoteGrabs/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2004, Daniel DiPaolo -# Copyright (c) 2008-2010, James Vega +# Copyright (c) 2008-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/QuoteGrabs/test.py b/plugins/QuoteGrabs/test.py index 42d967851..87e759673 100644 --- a/plugins/QuoteGrabs/test.py +++ b/plugins/QuoteGrabs/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2004, Daniel DiPaolo -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/RSS/plugin.py b/plugins/RSS/plugin.py index 580af283a..a4bd83661 100644 --- a/plugins/RSS/plugin.py +++ b/plugins/RSS/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2008-2010, James Vega +# Copyright (c) 2008-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/RSS/test.py b/plugins/RSS/test.py index 9b1b2db3a..5e9dea1c2 100644 --- a/plugins/RSS/test.py +++ b/plugins/RSS/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Relay/plugin.py b/plugins/Relay/plugin.py index 02ac1625c..dba7e4ea4 100644 --- a/plugins/Relay/plugin.py +++ b/plugins/Relay/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Scheduler/test.py b/plugins/Scheduler/test.py index e190fa5fa..5db322a84 100644 --- a/plugins/Scheduler/test.py +++ b/plugins/Scheduler/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Seen/plugin.py b/plugins/Seen/plugin.py index c519d4e5c..e818e9ac0 100644 --- a/plugins/Seen/plugin.py +++ b/plugins/Seen/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2010-2011, James Vega +# Copyright (c) 2010-2011, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Services/config.py b/plugins/Services/config.py index ffb2db783..45d606e6a 100644 --- a/plugins/Services/config.py +++ b/plugins/Services/config.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Services/plugin.py b/plugins/Services/plugin.py index c55eb8866..12a13b82a 100644 --- a/plugins/Services/plugin.py +++ b/plugins/Services/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/ShrinkUrl/__init__.py b/plugins/ShrinkUrl/__init__.py index ac9c61ea0..90310e8bc 100644 --- a/plugins/ShrinkUrl/__init__.py +++ b/plugins/ShrinkUrl/__init__.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/ShrinkUrl/config.py b/plugins/ShrinkUrl/config.py index 51596a063..50bf1a385 100644 --- a/plugins/ShrinkUrl/config.py +++ b/plugins/ShrinkUrl/config.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/ShrinkUrl/plugin.py b/plugins/ShrinkUrl/plugin.py index dc959b3b0..31af905b0 100644 --- a/plugins/ShrinkUrl/plugin.py +++ b/plugins/ShrinkUrl/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/ShrinkUrl/test.py b/plugins/ShrinkUrl/test.py index ea5fb1b5e..c4e9edbc9 100644 --- a/plugins/ShrinkUrl/test.py +++ b/plugins/ShrinkUrl/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Status/plugin.py b/plugins/Status/plugin.py index 279b90545..0332a96d5 100644 --- a/plugins/Status/plugin.py +++ b/plugins/Status/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/String/plugin.py b/plugins/String/plugin.py index 23b083e23..5a4c4b123 100644 --- a/plugins/String/plugin.py +++ b/plugins/String/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2003-2005, Jeremiah Fincher -# Copyright (c) 2008-2009, James Vega +# Copyright (c) 2008-2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/String/test.py b/plugins/String/test.py index f86d9e38b..da11bf1a3 100644 --- a/plugins/String/test.py +++ b/plugins/String/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2003-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Todo/plugin.py b/plugins/Todo/plugin.py index 90065e83a..20372303b 100644 --- a/plugins/Todo/plugin.py +++ b/plugins/Todo/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2003-2005, Daniel DiPaolo -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/URL/plugin.py b/plugins/URL/plugin.py index 5cc43bc3d..efae3fdc6 100644 --- a/plugins/URL/plugin.py +++ b/plugins/URL/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Unix/plugin.py b/plugins/Unix/plugin.py index bc6f8283b..436e25162 100644 --- a/plugins/Unix/plugin.py +++ b/plugins/Unix/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008-2010, James Vega +# Copyright (c) 2008-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Utilities/plugin.py b/plugins/Utilities/plugin.py index 33b8882ee..8d0452603 100644 --- a/plugins/Utilities/plugin.py +++ b/plugins/Utilities/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Web/plugin.py b/plugins/Web/plugin.py index 42f7e3e9b..0abb9ed51 100644 --- a/plugins/Web/plugin.py +++ b/plugins/Web/plugin.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/plugins/Web/test.py b/plugins/Web/test.py index 29507f472..3f99453fd 100644 --- a/plugins/Web/test.py +++ b/plugins/Web/test.py @@ -49,28 +49,8 @@ class WebTestCase(ChannelPluginTestCase): self.assertNotError('size http://www.slashdot.org/') def testTitle(self): - self.assertResponse('title http://www.slashdot.org/', - 'Slashdot: News for nerds, stuff that matters') - # Amazon add a bunch of scripting stuff to the top of their page, - # so we need to allow for a larger peekSize -# Actually, screw Amazon. Even bumping this up to 10k doesn't give us enough -# info. -# try: -# orig = conf.supybot.protocols.http.peekSize() -# conf.supybot.protocols.http.peekSize.setValue(8192) -# self.assertNotRegexp('title ' -# 'http://www.amazon.com/exec/obidos/tg/detail/-/' -# '1884822312/qid=1063140754/sr=8-1/ref=sr_8_1/' -# '002-9802970-2308826?v=glance&s=books&n=507846', -# 'no HTML title') -# finally: -# conf.supybot.protocols.http.peekSize.setValue(orig) - # Checks the non-greediness of the regexp - self.assertResponse('title ' - 'http://www.space.com/scienceastronomy/' - 'jupiter_dark_spot_031023.html', - 'SPACE.com -- Mystery Spot on Jupiter Baffles ' - 'Astronomers') + self.assertRegexp('title http://www.slashdot.org/', + 'News for nerds, stuff that matters') # Checks for @title not-working correctly self.assertResponse('title ' 'http://www.catb.org/~esr/jargon/html/F/foo.html', @@ -97,9 +77,8 @@ class WebTestCase(ChannelPluginTestCase): def testTitleSnarfer(self): try: conf.supybot.plugins.Web.titleSnarfer.setValue(True) - self.assertSnarfResponse('http://microsoft.com/', - 'Title: Microsoft Corporation' - ' (at microsoft.com)') + self.assertSnarfRegexp('http://microsoft.com/', + 'Title: Microsoft Corporation') finally: conf.supybot.plugins.Web.titleSnarfer.setValue(False) diff --git a/plugins/__init__.py b/plugins/__init__.py index 1cbb4308b..053e93ca8 100644 --- a/plugins/__init__.py +++ b/plugins/__init__.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/scripts/supybot b/scripts/supybot index 0d24388ff..f75cb6740 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -2,7 +2,7 @@ ### # Copyright (c) 2003-2004, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -44,8 +44,8 @@ import shutil import signal import cStringIO as StringIO -if sys.version_info < (2, 4, 0): - sys.stderr.write('This program requires Python >= 2.4.0') +if sys.version_info < (2, 6, 0): + sys.stderr.write('This program requires Python >= 2.6.0') sys.stderr.write(os.linesep) sys.exit(-1) diff --git a/scripts/supybot-botchk b/scripts/supybot-botchk index 4c72c55fb..e187d1242 100644 --- a/scripts/supybot-botchk +++ b/scripts/supybot-botchk @@ -2,7 +2,7 @@ ### # Copyright (c) 2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/scripts/supybot-plugin-create b/scripts/supybot-plugin-create index c695c0509..ed213bd8a 100644 --- a/scripts/supybot-plugin-create +++ b/scripts/supybot-plugin-create @@ -2,7 +2,7 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -43,8 +43,8 @@ def error(s): sys.stderr.write(os.linesep) sys.exit(-1) -if sys.version_info < (2, 4, 0): - error('This script requires Python 2.4 or newer.') +if sys.version_info < (2, 6, 0): + error('This script requires Python 2.6 or newer.') import supybot.conf as conf from supybot.questions import * diff --git a/scripts/supybot-plugin-doc b/scripts/supybot-plugin-doc index 88f9a1159..6b6eb3639 100644 --- a/scripts/supybot-plugin-doc +++ b/scripts/supybot-plugin-doc @@ -2,7 +2,7 @@ ### # Copyright (c) 2005, Ali Afshar -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/scripts/supybot-test b/scripts/supybot-test index a950a07d9..b5338a93e 100644 --- a/scripts/supybot-test +++ b/scripts/supybot-test @@ -2,7 +2,7 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2011, James Vega +# Copyright (c) 2011, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index 0ca402225..55734210e 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -2,7 +2,7 @@ ### # Copyright (c) 2003-2004, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -39,8 +39,8 @@ def error(s): sys.stderr.write(os.linesep) sys.exit(-1) -if sys.version_info < (2, 4, 0): - error('This program requires Python >= 2.4.0') +if sys.version_info < (2, 6, 0): + error('This program requires Python >= 2.6.0') import supybot diff --git a/setup.py b/setup.py index 43af8d38b..ec180f9e3 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -30,10 +30,12 @@ # POSSIBILITY OF SUCH DAMAGE. ### +import os import sys if sys.version_info < (2, 6, 0): - sys.stderr.write("Supybot requires Python 2.6 or newer.\n") + sys.stderr.write("Supybot requires Python 2.6 or newer.") + sys.stderr.write(os.linesep) sys.exit(-1) import textwrap diff --git a/src/__init__.py b/src/__init__.py index 8a9da0bf0..8f811c7da 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -54,7 +54,7 @@ class Author(object): class authors(object): # This is basically a bag. jemfinch = Author('Jeremy Fincher', 'jemfinch', 'jemfinch@users.sf.net') - jamessan = Author('James Vega', 'jamessan', 'jamessan@users.sf.net') + jamessan = Author('James McCoy', 'jamessan', 'vega.james@gmail.com') strike = Author('Daniel DiPaolo', 'Strike', 'ddipaolo@users.sf.net') baggins = Author('William Robinson', 'baggins', 'airbaggins@users.sf.net') skorobeus = Author('Kevin Murphy', 'Skorobeus', 'skoro@skoroworld.com') diff --git a/src/callbacks.py b/src/callbacks.py index 67c3f8bf7..523806a61 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008-2010, James Vega +# Copyright (c) 2008-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -491,18 +491,23 @@ class RichReplyMethods(object): if isinstance(capability, basestring): # checkCommandCapability! log.warning('Denying %s for lacking %q capability.', self.msg.prefix, capability) - if not self._getConfig(conf.supybot.reply.error.noCapability): - if capability in conf.supybot.capabilities.private(): - v = self._getConfig(conf.supybot.replies.genericNoCapability) - else: - v = self._getConfig(conf.supybot.replies.noCapability) - v %= capability - s = self.__makeReply(v, s) - return self._error(s, **kwargs) + # noCapability means "don't send a specific capability error + # message" not "don't send a capability error message at all", like + # one would think + if self._getConfig(conf.supybot.reply.error.noCapability) or \ + capability in conf.supybot.capabilities.private(): + v = self._getConfig(conf.supybot.replies.genericNoCapability) else: - log.debug('Not sending capability error, ' - 'supybot.reply.error.noCapability is False.') - raise SilentError + v = self._getConfig(conf.supybot.replies.noCapability) + v %= capability + s = self.__makeReply(v, s) + return self._error(s, **kwargs) + if self._getConfig(conf.supybot.reply.error.noCapability): + v = self._getConfig(conf.supybot.replies.genericNoCapability) + else: + v = self._getConfig(conf.supybot.replies.noCapability) + s = self.__makeReply(v % capability, s) + return self._error(s, **kwargs) else: log.warning('Denying %s for some unspecified capability ' '(or a default).', self.msg.prefix) diff --git a/src/commands.py b/src/commands.py index 04a1cb839..564620985 100644 --- a/src/commands.py +++ b/src/commands.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/conf.py b/src/conf.py index 7069f5871..d5b484d87 100644 --- a/src/conf.py +++ b/src/conf.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008-2009,2011, James Vega +# Copyright (c) 2008-2009,2011, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/drivers/Socket.py b/src/drivers/Socket.py index 4636233a3..306aafebf 100644 --- a/src/drivers/Socket.py +++ b/src/drivers/Socket.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/drivers/Twisted.py b/src/drivers/Twisted.py index b6d72fc90..6429022c4 100644 --- a/src/drivers/Twisted.py +++ b/src/drivers/Twisted.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/drivers/__init__.py b/src/drivers/__init__.py index 03cf9e59b..302222ad7 100644 --- a/src/drivers/__init__.py +++ b/src/drivers/__init__.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2004, Jeremiah Fincher -# Copyright (c) 2008-2009, James Vega +# Copyright (c) 2008-2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/ircdb.py b/src/ircdb.py index a4db30b0f..b55da6647 100644 --- a/src/ircdb.py +++ b/src/ircdb.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2009, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # Copyright (c) 2011, Valentin Lorentz # All rights reserved. # diff --git a/src/irclib.py b/src/irclib.py index 767ed552e..4f209f04b 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -406,7 +406,7 @@ class IrcState(IrcCommandDispatcher): """Handles parsing the 004 reply Supported user and channel modes are cached""" - # msg.args = [nickname, server, ircd-version, umodes, modes, + # msg.args = [nick, server, ircd-version, umodes, modes, # modes that require arguments? (non-standard)] self.supported['umodes'] = msg.args[3] self.supported['chanmodes'] = msg.args[4] diff --git a/src/ircmsgs.py b/src/ircmsgs.py index 2d7e6232c..09759d950 100644 --- a/src/ircmsgs.py +++ b/src/ircmsgs.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2010, James Vega +# Copyright (c) 2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/ircutils.py b/src/ircutils.py index eced6641e..ffd71a2d2 100644 --- a/src/ircutils.py +++ b/src/ircutils.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009,2011, James Vega +# Copyright (c) 2009,2011, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/registry.py b/src/registry.py index 7f83435c1..25dbc2fee 100644 --- a/src/registry.py +++ b/src/registry.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2004-2005, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/test.py b/src/test.py index 58f5e4fd7..10e0847ec 100644 --- a/src/test.py +++ b/src/test.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2011, James Vega +# Copyright (c) 2011, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/utils/__init__.py b/src/utils/__init__.py index c32e23ef9..01bff946b 100644 --- a/src/utils/__init__.py +++ b/src/utils/__init__.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/utils/crypt.py b/src/utils/crypt.py index bfbb9ad4c..dfc19936d 100644 --- a/src/utils/crypt.py +++ b/src/utils/crypt.py @@ -1,5 +1,5 @@ ### -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/utils/file.py b/src/utils/file.py index 99b725426..e276c3acb 100644 --- a/src/utils/file.py +++ b/src/utils/file.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/utils/gen.py b/src/utils/gen.py index 7f9a6fd32..330aaf53d 100644 --- a/src/utils/gen.py +++ b/src/utils/gen.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/utils/net.py b/src/utils/net.py index 3b09c7e8a..9a14b5cb6 100644 --- a/src/utils/net.py +++ b/src/utils/net.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2011, James Vega +# Copyright (c) 2011, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/utils/python.py b/src/utils/python.py index 23c4df764..976b2c590 100644 --- a/src/utils/python.py +++ b/src/utils/python.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2005-2009, Jeremiah Fincher -# Copyright (c) 2009-2010, James Vega +# Copyright (c) 2009-2010, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/utils/str.py b/src/utils/str.py index 93cabc008..a27438a47 100644 --- a/src/utils/str.py +++ b/src/utils/str.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008-2009, James Vega +# Copyright (c) 2008-2009, James McCoy # Copyright (c) 2010, Valentin Lorentz # All rights reserved. # diff --git a/src/utils/web.py b/src/utils/web.py index e3f320c73..8d9a4881b 100644 --- a/src/utils/web.py +++ b/src/utils/web.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009, James Vega +# Copyright (c) 2009, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/test/test_irclib.py b/test/test_irclib.py index 8190ff5cd..428e26898 100644 --- a/test/test_irclib.py +++ b/test/test_irclib.py @@ -288,7 +288,7 @@ class IrcStateTestCase(SupyTestCase): def testSupportedUmodes(self): state = irclib.IrcState() - state.addMsg(self.irc, ircmsgs.IrcMsg(':charm.oftc.net 004 adkwbot charm.oftc.net hybrid-7.2.2+oftc1.6.8 CDGPRSabcdfgiklnorsuwxyz biklmnopstveI bkloveI')) + state.addMsg(self.irc, ircmsgs.IrcMsg(':coulomb.oftc.net 004 testnick coulomb.oftc.net hybrid-7.2.2+oftc1.6.8 CDGPRSabcdfgiklnorsuwxyz biklmnopstveI bkloveI')) self.assertEqual(state.supported['umodes'], 'CDGPRSabcdfgiklnorsuwxyz') self.assertEqual(state.supported['chanmodes'], 'biklmnopstveI') diff --git a/test/test_plugins.py b/test/test_plugins.py index 54d79df4b..04968b4d6 100644 --- a/test/test_plugins.py +++ b/test/test_plugins.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2008, James Vega +# Copyright (c) 2008, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/test/test_utils.py b/test/test_utils.py index d047c19d7..dde9af6cd 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,6 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher -# Copyright (c) 2009,2011, James Vega +# Copyright (c) 2009,2011, James McCoy # All rights reserved. # # Redistribution and use in source and binary forms, with or without