diff --git a/plugins/Bugzilla.py b/plugins/Bugzilla.py index 469fb87e5..2767f4a82 100644 --- a/plugins/Bugzilla.py +++ b/plugins/Bugzilla.py @@ -77,7 +77,7 @@ def configure(advanced): conf.registerPlugin('Bugzilla', True) output("""The Bugzilla plugin has the functionality to watch for URLs that match a specific pattern (we call this a snarfer). When - a supybot sees such a URL, it will parse the web page for + a Supybot sees such a URL, it will parse the web page for information and reply with the results.""") if yn('Do you want this bug snarfer enabled by default?', default=False): conf.supybot.plugins.Bugzilla.bugSnarfer.setValue(True) diff --git a/plugins/Ebay.py b/plugins/Ebay.py index 1ec40294c..b3a88b088 100644 --- a/plugins/Ebay.py +++ b/plugins/Ebay.py @@ -55,7 +55,7 @@ def configure(advanced): conf.registerPlugin('Ebay', True) output("""The Ebay plugin has the functionality to watch for URLs that match a specific pattern (we call this a snarfer). When - supybot sees such a URL, he will parse the web page for + Supybot sees such a URL, he will parse the web page for information and reply with the results.""") if yn('Do you want the Ebay snarfer enabled by default?'): conf.supybot.plugins.Ebay.auctionSnarfer.setValue(True) diff --git a/plugins/Filter.py b/plugins/Filter.py index 314130959..a140203fd 100644 --- a/plugins/Filter.py +++ b/plugins/Filter.py @@ -299,7 +299,7 @@ class Filter(callbacks.Privmsg): _revcode = dict([(y, x) for (x, y) in _code.items()]) _unmorsere = re.compile('([.-]+)') def unmorse(self, irc, msg, args): - """ + """ Does the reverse of the morse command. """ @@ -317,7 +317,7 @@ class Filter(callbacks.Privmsg): def morse(self, irc, msg, args): """ - Gives the morse code equivalent of a given string. + Gives the Morse code equivalent of a given string. """ text = privmsgs.getArgs(args) L = [] diff --git a/src/Admin.py b/src/Admin.py index 05834d102..dc337383a 100755 --- a/src/Admin.py +++ b/src/Admin.py @@ -111,7 +111,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg): try: channel = msg.args[1] (irc, msg) = self.joins.pop(channel) - irc.error('Cannot join %s, I\'m not identified with the nickserv.' + irc.error('Cannot join %s, I\'m not identified with the NickServ.' % channel) except KeyError: self.log.debug('Got 515 without Admin.join being called.') @@ -192,7 +192,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg): self.log.debug('Got 433 without Admin.nick being called.') def do438(self, irc, msg): - """Can't change nick while in +m channel. Could just be freenode.""" + """Can't change nick while in +m channel. Could just be Freenode.""" irc = self.pendingNickChanges.get(irc, None) if irc is not None: channel = msg.args[-1].strip().split()[-1][1:-1] diff --git a/src/Misc.py b/src/Misc.py index b60522821..f86e3b04b 100755 --- a/src/Misc.py +++ b/src/Misc.py @@ -250,7 +250,7 @@ class Misc(callbacks.Privmsg): newest ='The newest version available online is %s.'%newest.strip() except webutils.WebError, e: self.log.warning('Couldn\'t get website version: %r', e) - newest = 'I could\'t fetch the newest version ' \ + newest = 'I couldn\'t fetch the newest version ' \ 'from the Supybot website.' s = 'The current (running) version of this Supybot is %s. %s' % \ (conf.version, newest) diff --git a/src/Owner.py b/src/Owner.py index b9042dead..c38fdd145 100644 --- a/src/Owner.py +++ b/src/Owner.py @@ -99,7 +99,7 @@ def loadPluginModule(name, ignoreDeprecation=False): return module def loadPluginClass(irc, module, register=None): - """Loads the plugin Class from the given module into the given irc.""" + """Loads the plugin Class from the given module into the given Irc.""" try: cb = module.Class() except AttributeError: @@ -154,7 +154,7 @@ class holder(object): class LogProxy(object): """ - Logs to the global supybot log at critical priority. Useful for + Logs to the global Supybot log at critical priority. Useful for marking logfiles for later searching. """ __name__ = 'log' # Necessary for help. @@ -356,7 +356,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg): else: # This should never happen, so I haven't bothered updating # this error string to say --allow-eval. - irc.error('You must run supybot with the --allow-eval ' + irc.error('You must run Supybot with the --allow-eval ' 'option for this command to be enabled.') def _exec(self, irc, msg, args): @@ -373,7 +373,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg): irc.reply(utils.exnToString(e)) else: # This should never happen. - irc.error('You must run supybot with the --allow-eval ' + irc.error('You must run Supybot with the --allow-eval ' 'option for this command to be enabled.') else: def eval(self, irc, msg, args): diff --git a/src/ircmsgs.py b/src/ircmsgs.py index afc4020aa..bb2e7990c 100644 --- a/src/ircmsgs.py +++ b/src/ircmsgs.py @@ -258,7 +258,7 @@ def toXml(msg, pretty=True, includeTime=True): def prettyPrint(msg, addRecipients=False): """Provides a client-friendly string form for messages. - IIRC, I copied BitchX's (or was it xchat's?) format for messages. + IIRC, I copied BitchX's (or was it XChat's?) format for messages. """ def nickorprefix(): return msg.nick or msg.prefix diff --git a/src/ircutils.py b/src/ircutils.py index 450406c1a..4b06c7966 100644 --- a/src/ircutils.py +++ b/src/ircutils.py @@ -402,7 +402,7 @@ class FormatParser(object): def wrap(s, length): if length < 100: - raise ValueError, 'Use with a length greater than 100, sucka.' + raise ValueError, 'Use ircutils.wrap with a length greater than 100.' processed = [] chunks = textwrap.wrap(s, length) context = None @@ -508,6 +508,8 @@ mircColors = IrcDict({ 'pink': '13', 'dark grey': '14', 'light grey': '15', + 'dark gray': '14', + 'light gray': '15', }) # We'll map integers to their string form so mircColor is simpler.