From d053a660b091630a46ff9f103e26c85f412fa186 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 30 Jul 2012 23:21:26 -0400 Subject: [PATCH 01/26] callbacks.py: Always error when capabilities aren't satisfied. Signed-off-by: James McCoy --- src/callbacks.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/callbacks.py b/src/callbacks.py index eaf43cce7..bde93dc5f 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -465,13 +465,15 @@ 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): - v = self._getConfig(conf.supybot.replies.noCapability) - s = self.__makeReply(v % capability, 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): + v = self._getConfig(conf.supybot.replies.genericNoCapability) else: - log.debug('Not sending capability error, ' - 'supybot.reply.error.noCapability is False.') + 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) From 19a8df5b468eea2a78b319e1e23ab2b4833c6156 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Mon, 30 Jul 2012 11:18:02 +0200 Subject: [PATCH 02/26] Fix typo in registry.close(). Signed-off-by: James McCoy --- src/registry.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registry.py b/src/registry.py index 228bf9ee9..2bd23258a 100644 --- a/src/registry.py +++ b/src/registry.py @@ -116,12 +116,12 @@ def close(registry, filename, private=True): try: x = value.__class__(value._default, value._help) except Exception, e: - exception('Exception instantiating default for %s:', + exception('Exception instantiating default for %s:' % value._name) try: lines.append('# Default value: %s\n' % x) except Exception, e: - exception('Exception printing default value of %s:', + exception('Exception printing default value of %s:' % value._name) lines.append('###\n') fd.writelines(lines) From c74e8f35abfe511ae85feac47ed90e4df5a513fa Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 26 Aug 2012 12:59:41 -0400 Subject: [PATCH 03/26] Fix regression in parsing 004 messages This was introduced in commit 4232e40e262cbbdb675b1cf315c43f576d8b1f43 Signed-off-by: James McCoy --- src/irclib.py | 6 +++--- test/test_irclib.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/irclib.py b/src/irclib.py index c4292e880..062b6ecc7 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -404,10 +404,10 @@ class IrcState(IrcCommandDispatcher): """Handles parsing the 004 reply Supported user and channel modes are cached""" - # msg.args = [server, ircd-version, umodes, modes, + # msg.args = [nick, server, ircd-version, umodes, modes, # modes that require arguments? (non-standard)] - self.supported['umodes'] = msg.args[2] - self.supported['chanmodes'] = msg.args[3] + self.supported['umodes'] = msg.args[3] + self.supported['chanmodes'] = msg.args[4] _005converters = utils.InsensitivePreservingDict({ 'modes': int, diff --git a/test/test_irclib.py b/test/test_irclib.py index bda696be6..b9799e3a3 100644 --- a/test/test_irclib.py +++ b/test/test_irclib.py @@ -292,7 +292,7 @@ class IrcStateTestCase(SupyTestCase): def testSupportedUmodes(self): state = irclib.IrcState() - state.addMsg(self.irc, ircmsgs.IrcMsg(':charm.oftc.net 004 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') From 83f872fa123994a15c8996dc25934b3055a51715 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 1 Sep 2012 10:06:50 -0400 Subject: [PATCH 04/26] Bump minimum Python version to 2.6 for multiprocessing support Signed-off-by: James McCoy --- INSTALL | 2 +- RELNOTES | 2 +- docs/PLUGIN_TUTORIAL.rst | 2 +- scripts/supybot | 4 ++-- scripts/supybot-plugin-create | 4 ++-- scripts/supybot-wizard | 4 ++-- setup.py | 6 ++++-- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/INSTALL b/INSTALL index 1b90d1941..5017e4c68 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ Common - First things first: Supybot *requires* at least Python 2.4. There + First things first: Supybot *requires* at least Python 2.6. There ain't no getting around it. You can get it from http://www.python.org/. Recommended Software 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/scripts/supybot b/scripts/supybot index 7b32d2858..c704077f4 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -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-plugin-create b/scripts/supybot-plugin-create index 92aa431ae..78f822fb8 100644 --- a/scripts/supybot-plugin-create +++ b/scripts/supybot-plugin-create @@ -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-wizard b/scripts/supybot-wizard index f19af729e..7d8c0ae4b 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -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 973edf94d..513c0a166 100644 --- a/setup.py +++ b/setup.py @@ -30,10 +30,12 @@ # POSSIBILITY OF SUCH DAMAGE. ### +import os import sys -if sys.version_info < (2, 4, 0): - sys.stderr.write("Supybot requires Python 2.4 or newer.\n") +if sys.version_info < (2, 6, 0): + sys.stderr.write("Supybot requires Python 2.6 or newer.") + sys.stderr.write(os.linesep) sys.exit(-1) import textwrap From 82ecf36fcdfb16a19e282b93b7064a6f823e7e1e Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 1 Sep 2012 10:16:48 -0400 Subject: [PATCH 05/26] Update my name/contact information Signed-off-by: James McCoy --- docs/conf.py | 4 ++-- docs/man/supybot-adduser.1 | 4 ++-- docs/man/supybot-botchk.1 | 4 ++-- docs/man/supybot-plugin-create.1 | 4 ++-- docs/man/supybot-plugin-doc.1 | 4 ++-- docs/man/supybot-test.1 | 4 ++-- docs/man/supybot-wizard.1 | 4 ++-- docs/man/supybot.1 | 4 ++-- plugins/Alias/plugin.py | 2 +- plugins/Anonymous/plugin.py | 2 +- plugins/Anonymous/test.py | 2 +- plugins/AutoMode/plugin.py | 2 +- plugins/BadWords/plugin.py | 2 +- plugins/Channel/config.py | 2 +- plugins/Channel/test.py | 2 +- plugins/ChannelLogger/config.py | 2 +- plugins/ChannelLogger/plugin.py | 2 +- plugins/ChannelStats/plugin.py | 2 +- plugins/ChannelStats/test.py | 2 +- plugins/Config/plugin.py | 2 +- plugins/Config/test.py | 2 +- plugins/Dict/plugin.py | 2 +- plugins/Factoids/config.py | 2 +- plugins/Factoids/plugin.py | 2 +- plugins/Factoids/test.py | 2 +- plugins/Games/plugin.py | 2 +- plugins/Google/config.py | 2 +- plugins/Google/plugin.py | 2 +- plugins/Google/test.py | 2 +- plugins/Internet/plugin.py | 2 +- plugins/Internet/test.py | 2 +- plugins/Karma/plugin.py | 2 +- plugins/Later/plugin.py | 2 +- plugins/Limiter/plugin.py | 2 +- plugins/Math/plugin.py | 2 +- plugins/Math/test.py | 2 +- plugins/Misc/plugin.py | 2 +- plugins/Misc/test.py | 2 +- plugins/Network/plugin.py | 2 +- plugins/Note/plugin.py | 2 +- plugins/Owner/plugin.py | 2 +- plugins/Owner/test.py | 2 +- plugins/QuoteGrabs/plugin.py | 2 +- plugins/QuoteGrabs/test.py | 2 +- plugins/RSS/plugin.py | 2 +- plugins/RSS/test.py | 2 +- plugins/Relay/plugin.py | 2 +- plugins/Scheduler/test.py | 2 +- plugins/Seen/plugin.py | 2 +- plugins/Services/config.py | 2 +- plugins/Services/plugin.py | 2 +- plugins/ShrinkUrl/__init__.py | 2 +- plugins/ShrinkUrl/config.py | 2 +- plugins/ShrinkUrl/plugin.py | 2 +- plugins/ShrinkUrl/test.py | 2 +- plugins/Status/plugin.py | 2 +- plugins/String/plugin.py | 2 +- plugins/String/test.py | 2 +- plugins/Todo/plugin.py | 2 +- plugins/URL/plugin.py | 2 +- plugins/Unix/plugin.py | 2 +- plugins/Utilities/plugin.py | 2 +- plugins/Web/plugin.py | 2 +- plugins/__init__.py | 2 +- scripts/supybot | 2 +- scripts/supybot-botchk | 2 +- scripts/supybot-plugin-create | 2 +- scripts/supybot-plugin-doc | 2 +- scripts/supybot-test | 2 +- scripts/supybot-wizard | 2 +- setup.py | 2 +- src/__init__.py | 2 +- src/callbacks.py | 2 +- src/commands.py | 2 +- src/conf.py | 2 +- src/drivers/Socket.py | 2 +- src/drivers/Twisted.py | 2 +- src/drivers/__init__.py | 2 +- src/ircdb.py | 2 +- src/ircmsgs.py | 2 +- src/ircutils.py | 2 +- src/registry.py | 2 +- src/test.py | 2 +- src/utils/__init__.py | 2 +- src/utils/crypt.py | 2 +- src/utils/file.py | 2 +- src/utils/gen.py | 2 +- src/utils/net.py | 2 +- src/utils/python.py | 2 +- src/utils/str.py | 2 +- src/utils/web.py | 2 +- test/test_plugins.py | 2 +- test/test_utils.py | 2 +- 93 files changed, 101 insertions(+), 101 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e41bd87a1..fb037b437 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 f90eb29cf..f6dfc229a 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 9eb95260d..7715cfafc 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 8100f80a9..56b4a209e 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 e373567a4..224a1e204 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 023073dde..3d0f0762c 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 e33b3b51f..bcc98e431 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/config.py b/plugins/ChannelLogger/config.py index eae2ac7a4..4d8d99c3a 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 93f9b3c06..dbbdfe3ab 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/plugin.py b/plugins/ChannelStats/plugin.py index d09129bed..4b0f235f0 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 40cea6d42..e2ba158ce 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 0b2dd6fda..cdb93e82f 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 49130b08e..e39bf97ae 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 989ee687b..57d0ae5d3 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 79b43b654..791317164 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 448a4cd43..cafd0dccb 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 fb8fa7e35..59f8878da 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 203bb9fd5..b020a5b80 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 a309911ab..9f029aecc 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 2adef8ef3..cc2fc4e46 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 diff --git a/plugins/Google/test.py b/plugins/Google/test.py index fe7affc3d..77bdb41f8 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 diff --git a/plugins/Internet/plugin.py b/plugins/Internet/plugin.py index de94afcd9..ce35f0c21 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 392590f78..c52f859e2 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 3babf6365..31e100efa 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 c3e02cc11..d6ffe15be 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 01c9261fc..98bda7726 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 c3ea12695..1fbb94a2d 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 1f379263b..41212337e 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 2eb405f01..8ab5cdf48 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 3fd3cb326..e624e1a3e 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 c0a1ffe4d..ba0696261 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/QuoteGrabs/plugin.py b/plugins/QuoteGrabs/plugin.py index 03d3a98d6..6ec8f9718 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 d23dabe72..a3b5cebe6 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 203159aa3..203f8ecf3 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 fba29f59d..8ea6ea9fd 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 aa09131ea..c94fdfc78 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 5ca8484f1..fd0da2370 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 fa5429510..0d496da3a 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 d162c27dc..063e751ec 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 caf606668..3a0855959 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 fccd58336..10ae9d824 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 ce4c2ef06..a2fe1517b 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 b995140ba..d30e37feb 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 50787ca68..cf8cbdce4 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 4e05fe12d..606c1d792 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 9255b937c..941f9162f 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 6a332c792..78ba0f0d3 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/__init__.py b/plugins/__init__.py index c177eb840..081334842 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 c704077f4..01afdccee 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 diff --git a/scripts/supybot-botchk b/scripts/supybot-botchk index 468bead4f..d61a96e81 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 78f822fb8..e3c5e8a8a 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 diff --git a/scripts/supybot-plugin-doc b/scripts/supybot-plugin-doc index c5b2950db..f83c3cbd6 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 c0a500713..e01a5d56c 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 7d8c0ae4b..3d3144c77 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 diff --git a/setup.py b/setup.py index 513c0a166..a24f8ac8f 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 diff --git a/src/__init__.py b/src/__init__.py index 22923e31a..e3ffdf162 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -49,7 +49,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 10edacb04..49222b5f7 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 diff --git a/src/commands.py b/src/commands.py index 717465a9c..e38908a41 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 fcc7f9200..e23efd009 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 ff9e59146..a9d98459a 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 edd5ad5db..1e51b879e 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 # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/ircmsgs.py b/src/ircmsgs.py index 13ead36af..213247787 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 2275d3d44..9f07f900e 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 6715de5f2..ca9568daa 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 a9f716264..b7488f0d2 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 7de7a425d..76e0d6cf1 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 3043079e5..a59b2e3f7 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 6fd138cd3..e071ff819 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 17abb3b5b..0e657e9f0 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 f38de2f78..70ca52ba9 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 c6d801ce7..9fb4223bc 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 # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/utils/web.py b/src/utils/web.py index 6a1fa9361..ae3cf38b8 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_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 da94678e6..f3b74ce35 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 From c609f88779e1a9f2008356704fa8cb12ba9a8b73 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 00:25:24 +0300 Subject: [PATCH 06/26] Anonymous: added readme Signed-off-by: James McCoy --- plugins/Anonymous/README.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/Anonymous/README.txt b/plugins/Anonymous/README.txt index d60b47a97..ddff5abdd 100644 --- a/plugins/Anonymous/README.txt +++ b/plugins/Anonymous/README.txt @@ -1 +1,4 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +Anonymous allows you to send messages anonymously as the bot. If +supybot.plugins.Anonymous.allowPrivateTarget is True, you can send messages in query too. + +One usage example is to identify the bot with NickServ if it fails to identify for some reason. From f96fcaf0001678c691d78ff37ed8be81ee233356 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 00:30:45 +0300 Subject: [PATCH 07/26] AutoMode: improved readme Signed-off-by: James McCoy --- plugins/AutoMode/README.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/AutoMode/README.txt b/plugins/AutoMode/README.txt index d60b47a97..23577ec2e 100644 --- a/plugins/AutoMode/README.txt +++ b/plugins/AutoMode/README.txt @@ -1 +1,3 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin automaticly voices/halfops/ops users with #channel, capability +when they join to the channel. +It will also ban automaticly everyone who is in channel ban list ( @channel ban list ). From 55dd7810d2b6e898e98c06b2b5215a11c0b2fbb6 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 00:34:08 +0300 Subject: [PATCH 08/26] ChannelLogger: improved readme Signed-off-by: James McCoy --- plugins/ChannelLogger/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ChannelLogger/README.txt b/plugins/ChannelLogger/README.txt index d60b47a97..b500ba012 100644 --- a/plugins/ChannelLogger/README.txt +++ b/plugins/ChannelLogger/README.txt @@ -1 +1 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin automatically logs the channels where the bot is. From 9f0c308f191f6deac68e1a5b35d2b8b5c98c282e Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 00:36:09 +0300 Subject: [PATCH 09/26] ChannelStats: improved README Signed-off-by: James McCoy --- plugins/ChannelStats/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ChannelStats/README.txt b/plugins/ChannelStats/README.txt index d60b47a97..5c706ad4b 100644 --- a/plugins/ChannelStats/README.txt +++ b/plugins/ChannelStats/README.txt @@ -1 +1 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin keeps stats of the channel and returns them with the command ChannelStats. From b41affa8b6842dd2d79429fd3efec4fa4625ed77 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Tue, 4 Sep 2012 22:50:23 -0400 Subject: [PATCH 10/26] fixup 9f0c308f --- plugins/ChannelStats/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From 11ef44c0602573e8cdf9c617aa6c578c60812cb6 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 00:49:42 +0300 Subject: [PATCH 11/26] Ctcp: improved README Signed-off-by: James McCoy --- plugins/Ctcp/README.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Ctcp/README.txt b/plugins/Ctcp/README.txt index d60b47a97..b7b5e3c1f 100644 --- a/plugins/Ctcp/README.txt +++ b/plugins/Ctcp/README.txt @@ -1 +1,2 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin gives command "@ctcp version" which returns all CTCP version responses to channel. +It also adds CTCP responses to the bot. From dc416ecf20e11910ea508037e34a7c1885aaa6fa Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 00:52:31 +0300 Subject: [PATCH 12/26] Dunno: improved README Signed-off-by: James McCoy --- plugins/Dunno/README.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Dunno/README.txt b/plugins/Dunno/README.txt index d60b47a97..4bdab2367 100644 --- a/plugins/Dunno/README.txt +++ b/plugins/Dunno/README.txt @@ -1 +1,2 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin allows using of personalized error messages (Dunnos) in place of invalid command +("Error: qwertyytrewq is not a valid command") error messages. From bc9450eead56f4628c6234430a87193eec570f20 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 00:54:12 +0300 Subject: [PATCH 13/26] Factoids: improved README Signed-off-by: James McCoy --- plugins/Factoids/README.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Factoids/README.txt b/plugins/Factoids/README.txt index d60b47a97..e3be0e6af 100644 --- a/plugins/Factoids/README.txt +++ b/plugins/Factoids/README.txt @@ -1 +1,2 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin gives the bot ability to show factoids. It can also show information about how many times +factoid has been called. From 0207b430760de4a68a2fb164224bc113ad8252e5 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 13:02:31 +0300 Subject: [PATCH 14/26] Filter: created readme from plugin help. Signed-off-by: James McCoy --- plugins/Filter/README.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/Filter/README.txt b/plugins/Filter/README.txt index d60b47a97..8c4b72b25 100644 --- a/plugins/Filter/README.txt +++ b/plugins/Filter/README.txt @@ -1 +1,5 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin offers several commands which transform text in some way. +It also provides the capability of using such commands to 'filter' +the output of the bot -- for instance, you could make everything the bot says be +in leetspeak, or Morse code, or any number of other kinds of filters. +Not very useful, but definitely quite fun :) From ee340fa42c60b05bd75de7e87f1710e0fecdb868 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 13:07:58 +0300 Subject: [PATCH 15/26] Format: improved README Signed-off-by: James McCoy --- plugins/Format/README.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Format/README.txt b/plugins/Format/README.txt index d60b47a97..52b9c6f7c 100644 --- a/plugins/Format/README.txt +++ b/plugins/Format/README.txt @@ -1 +1,2 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin provides commands which change the output format of the bot. For example you can make +the bot to bold something. From 8c1c34c723dc8b769a9aad17ccefaf2c27f184a9 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 13:13:04 +0300 Subject: [PATCH 16/26] Games: improved README. Signed-off-by: James McCoy --- plugins/Games/README.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Games/README.txt b/plugins/Games/README.txt index d60b47a97..6729eb5a0 100644 --- a/plugins/Games/README.txt +++ b/plugins/Games/README.txt @@ -1 +1,2 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin provides some fun games like (Russian) roulette, 8ball, monologue which tells you +how many lines you have spoken without anyone interrupting you, coin and dice. From 49288d2a27b3a2c06613cc6464303ae8a9180378 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 13:15:10 +0300 Subject: [PATCH 17/26] Herald: improved README. Signed-off-by: James McCoy --- plugins/Herald/README.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Herald/README.txt b/plugins/Herald/README.txt index d60b47a97..58bf9e2a5 100644 --- a/plugins/Herald/README.txt +++ b/plugins/Herald/README.txt @@ -1 +1,2 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin allows you to set welcoming messages (heralds) to people who are regognized by the bot +when they join the channel. From 5166d840aaa8bf6f797fdb8dfe45b729bc8a3b60 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 8 Jul 2011 13:20:23 +0300 Subject: [PATCH 18/26] Internet: improved README. Signed-off-by: James McCoy --- plugins/Internet/README.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Internet/README.txt b/plugins/Internet/README.txt index d60b47a97..a267eed98 100644 --- a/plugins/Internet/README.txt +++ b/plugins/Internet/README.txt @@ -1 +1,2 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin provides commands to transform domain into IP address and IP address to domain. +It also provides command to search WHOIS information. This plugin can also return hexips. From d38cc2daab8340577b5af46541f1cdb2183e66de Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Sat, 23 Jul 2011 11:46:43 +0300 Subject: [PATCH 19/26] MoobotFactoids: improved readme file from default. Signed-off-by: James McCoy --- plugins/MoobotFactoids/README.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/MoobotFactoids/README.txt b/plugins/MoobotFactoids/README.txt index d60b47a97..fd36d8ad6 100644 --- a/plugins/MoobotFactoids/README.txt +++ b/plugins/MoobotFactoids/README.txt @@ -1 +1,8 @@ -Insert a description of your plugin here, with any notes, etc. about using it. +This plugin keeps factoids in your bot. + +To add factoid say +"@factoids something is something" And when you call @something the bot says +"something is something". + +If you want factoid to be in different format say (for example): +"@factoids Hi is Hello" And when you call @hi the bot says "Hello." From bcfdcf09cff046dc65d8073b6bc08127d12c2663 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Tue, 26 Jul 2011 19:56:35 +0300 Subject: [PATCH 20/26] MoobotFactoids: fixed mistakes and added ACTION to README. Signed-off-by: James McCoy --- plugins/MoobotFactoids/README.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/MoobotFactoids/README.txt b/plugins/MoobotFactoids/README.txt index fd36d8ad6..1ed9ff1da 100644 --- a/plugins/MoobotFactoids/README.txt +++ b/plugins/MoobotFactoids/README.txt @@ -1,8 +1,11 @@ This plugin keeps factoids in your bot. To add factoid say -"@factoids something is something" And when you call @something the bot says +"@something is something" And when you call @something the bot says "something is something". If you want factoid to be in different format say (for example): -"@factoids Hi is Hello" And when you call @hi the bot says "Hello." +"@Hi is Hello" And when you call @hi the bot says "Hello." + +If you want the bot to use /mes with Factoids, that is possible too. +"@test is tests." and everytime when someone calls for "test" the bot answers *bot tests. From 5bb6fdcd5202fcdeb9d4f6f1f865ff21160f1f9e Mon Sep 17 00:00:00 2001 From: Daniel Folkinshteyn Date: Tue, 13 Dec 2011 18:21:38 -0500 Subject: [PATCH 21/26] core: avoid casting data to string if it is already an instance of basestring, in irc.reply. Signed-off-by: James McCoy --- src/callbacks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/callbacks.py b/src/callbacks.py index 49222b5f7..f8ec9eab9 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -826,7 +826,8 @@ class NestedCommandsIrcProxy(ReplyIrcProxy): # action=True implies noLengthCheck=True and prefixNick=False self.noLengthCheck=noLengthCheck or self.noLengthCheck or self.action target = self.private and self.to or self.msg.args[0] - s = str(s) # Allow non-string esses. + if not isinstance(s, basestring): # avoid trying to str() unicode + s = str(s) # Allow non-string esses. if self.finalEvaled: try: if isinstance(self.irc, self.__class__): From d73a801d8fb0fa0f7efe96e5d604004fc287b862 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 5 Sep 2012 21:35:56 -0400 Subject: [PATCH 22/26] Web: Remove/update non-functional tests Signed-off-by: James McCoy --- plugins/Web/test.py | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/plugins/Web/test.py b/plugins/Web/test.py index 9e6ff4f8a..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) From 124361d76d2c76af76017bb2c6dd44344182202d Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 5 Sep 2012 21:36:57 -0400 Subject: [PATCH 23/26] Ignore backup/ Signed-off-by: James McCoy --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 450fc4869..b41eb555e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +backup build test-data test-conf From b7efbf409cc7cbed3b368d8eb7eda5dbcc885449 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 5 Sep 2012 21:50:42 -0400 Subject: [PATCH 24/26] Plugin: Fix failures in testPlugin The tests were running into the ambiguity between nested commands and commands with the same name as their plugin, so "plugin plugin" is treated as specifying the plugin command from the plugin plugin. This leads to it displaying the help, since an argument is expected. Since the Utilities plugin is already loaded by the test suite, use a command from it as the argument to the plugin command. Signed-off-by: James McCoy --- plugins/Plugin/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Plugin/test.py b/plugins/Plugin/test.py index b5715adea..1845a3e18 100644 --- a/plugins/Plugin/test.py +++ b/plugins/Plugin/test.py @@ -32,8 +32,8 @@ from supybot.test import * class PluginTestCase(PluginTestCase): plugins = ('Plugin', 'Utilities') 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 testList(self): self.assertRegexp('plugin list', 'Plugin.*Utilities') From 304facd1672ee7f359f40e46b88f2bccfb1de65b Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 5 Sep 2012 22:51:11 -0400 Subject: [PATCH 25/26] Google: Remove translate command since their API is gone Signed-off-by: James McCoy --- plugins/Google/plugin.py | 46 ---------------------------------------- plugins/Google/test.py | 3 --- 2 files changed, 49 deletions(-) diff --git a/plugins/Google/plugin.py b/plugins/Google/plugin.py index cc2fc4e46..f8764877b 100644 --- a/plugins/Google/plugin.py +++ b/plugins/Google/plugin.py @@ -231,52 +231,6 @@ class Google(callbacks.PluginRegexp): s = ', '.join([format('%s: %i', bold(s), i) for (i, s) in results]) irc.reply(s) - _gtranslateUrl='http://ajax.googleapis.com/ajax/services/language/translate' - def translate(self, irc, msg, args, fromLang, toLang, text): - """ [to] - - Returns translated from into . - Beware that translating to or from languages that use multi-byte - characters may result in some very odd results. - """ - channel = msg.args[0] - ref = self.registryValue('referer') - if not ref: - ref = 'http://%s/%s' % (dynamic.irc.server, - dynamic.irc.nick) - headers = utils.web.defaultHeaders - headers['Referer'] = ref - opts = {'q': text, 'v': '1.0'} - lang = conf.supybot.plugins.Google.defaultLanguage - if fromLang.capitalize() in lang.transLangs: - fromLang = lang.transLangs[fromLang.capitalize()] - elif lang.normalize('lang_'+fromLang)[5:] \ - not in lang.transLangs.values(): - irc.errorInvalid('from language', fromLang, - format('Valid languages are: %L', - lang.transLangs.keys())) - else: - fromLang = lang.normalize('lang_'+fromLang)[5:] - if toLang.capitalize() in lang.transLangs: - toLang = lang.transLangs[toLang.capitalize()] - elif lang.normalize('lang_'+toLang)[5:] \ - not in lang.transLangs.values(): - irc.errorInvalid('to language', toLang, - format('Valid languages are: %L', - lang.transLangs.keys())) - else: - toLang = lang.normalize('lang_'+toLang)[5:] - opts['langpair'] = '%s|%s' % (fromLang, toLang) - fd = utils.web.getUrlFd('%s?%s' % (self._gtranslateUrl, - urllib.urlencode(opts)), - headers) - json = simplejson.load(fd) - fd.close() - if json['responseStatus'] != 200: - raise callbacks.Error, 'We broke The Google!' - irc.reply(json['responseData']['translatedText'].encode('utf-8')) - translate = wrap(translate, ['something', 'to', 'something', 'text']) - def googleSnarfer(self, irc, msg, match): r"^google\s+(.*)$" if not self.registryValue('searchSnarfer', msg.args[0]): diff --git a/plugins/Google/test.py b/plugins/Google/test.py index 77bdb41f8..6f005a91c 100644 --- a/plugins/Google/test.py +++ b/plugins/Google/test.py @@ -58,9 +58,6 @@ class GoogleTestCase(ChannelPluginTestCase): self.assertRegexp('fight supybot moobot', r'.*supybot.*: \d+') self.assertNotError('fight ... !') - def testTranslate(self): - self.assertRegexp('translate en es hello world', 'mundo') - def testCalcDoesNotHaveExtraSpaces(self): self.assertNotRegexp('google calc 1000^2', r'\s+,\s+') From 6f925e5f7ae1094d51f71f1dda4f38021c17f001 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 5 Sep 2012 23:04:10 -0400 Subject: [PATCH 26/26] Google: Remove calc and phonebook commands Signed-off-by: James McCoy --- plugins/Google/plugin.py | 48 ---------------------------------------- plugins/Google/test.py | 18 --------------- 2 files changed, 66 deletions(-) diff --git a/plugins/Google/plugin.py b/plugins/Google/plugin.py index f8764877b..0d87ab8a3 100644 --- a/plugins/Google/plugin.py +++ b/plugins/Google/plugin.py @@ -242,54 +242,6 @@ class Google(callbacks.PluginRegexp): irc.reply(url.encode('utf-8'), prefixNick=False) googleSnarfer = urlSnarfer(googleSnarfer) - def _googleUrl(self, s): - s = s.replace('+', '%2B') - s = s.replace(' ', '+') - url = r'http://google.com/search?q=' + s - return url - - _calcRe = re.compile(r'(.*?)', re.I) - _calcSupRe = re.compile(r'(.*?)', re.I) - _calcFontRe = re.compile(r'(.*?)') - _calcTimesRe = re.compile(r'&(?:times|#215);') - def calc(self, irc, msg, args, expr): - """ - - Uses Google's calculator to calculate the value of . - """ - url = self._googleUrl(expr) - html = utils.web.getUrl(url) - match = self._calcRe.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) - irc.reply(s) - else: - 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) - 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 6f005a91c..4b96da719 100644 --- a/plugins/Google/test.py +++ b/plugins/Google/test.py @@ -33,21 +33,6 @@ from supybot.test import * class GoogleTestCase(ChannelPluginTestCase): plugins = ('Google',) 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') @@ -58,7 +43,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: