Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jemfinch needs his dots!

This commit is contained in:
James Vega 2005-02-01 13:50:01 +00:00
parent 68d3b830da
commit 2b7e813ffd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/Misc/plugin.py
View File

@ -510,7 +510,7 @@ class Misc(callbacks.Privmsg):
head = 'The %s plugin' % cb.name() head = 'The %s plugin' % cb.name()
author = 'has not been claimed by an author' author = 'has not been claimed by an author'
conjunction = 'and' conjunction = 'and'
contrib = 'has no contributors listed' contrib = 'has no contributors listed.'
hasAuthor = False hasAuthor = False
hasContribs = False hasContribs = False
if getattr(module, '__author__', None): if getattr(module, '__author__', None):
@ -530,7 +530,7 @@ class Misc(callbacks.Privmsg):
len(contribs)) len(contribs))
hasContribs = True hasContribs = True
elif hasAuthor: elif hasAuthor:
contrib = 'has no additional contributors listed' contrib = 'has no additional contributors listed.'
if hasContribs and not hasAuthor: if hasContribs and not hasAuthor:
conjunction = 'but' conjunction = 'but'
return ' '.join([head, author, conjunction, contrib]) return ' '.join([head, author, conjunction, contrib])
@ -543,13 +543,13 @@ class Misc(callbacks.Privmsg):
authorInfo = getattr(supybot.authors, nick, None) authorInfo = getattr(supybot.authors, nick, None)
if not authorInfo: if not authorInfo:
return 'The nick specified (%s) is not a registered ' \ return 'The nick specified (%s) is not a registered ' \
'contributor' % nick 'contributor.' % nick
fullName = utils.web.mungeEmail(str(authorInfo)) fullName = utils.web.mungeEmail(str(authorInfo))
contributions = [] contributions = []
if hasattr(module, '__contributors__'): if hasattr(module, '__contributors__'):
if authorInfo not in module.__contributors__: if authorInfo not in module.__contributors__:
return 'The %s plugin does not have \'%s\' listed as a ' \ return 'The %s plugin does not have \'%s\' listed as a ' \
'contributor' % (cb.name(), nick) 'contributor.' % (cb.name(), nick)
contributions = module.__contributors__[authorInfo] contributions = module.__contributors__[authorInfo]
if getattr(module, '__author__', False) == authorInfo: if getattr(module, '__author__', False) == authorInfo:
isAuthor = True isAuthor = True
@ -564,17 +564,17 @@ class Misc(callbacks.Privmsg):
if nonCommands: if nonCommands:
results.append(format('the %L', nonCommands)) results.append(format('the %L', nonCommands))
if results and isAuthor: if results and isAuthor:
return format('%s wrote the %s plugin and also contributed %L', return format(
(fullName, cb.name(), results)) '%s wrote the %s plugin and also contributed %L.',
(fullName, cb.name(), results))
elif results and not isAuthor: elif results and not isAuthor:
return format('%s contributed %L to the %s plugin', return format('%s contributed %L to the %s plugin.',
fullName, results, cb.name()) fullName, results, cb.name())
elif isAuthor and not results: elif isAuthor and not results:
return '%s wrote the %s plugin' % (fullName, cb.name()) return '%s wrote the %s plugin' % (fullName, cb.name())
# XXX Does this ever actually get reached? If so, the string # XXX Does this ever actually get reached?
# formatting needs to be fixed.
else: else:
return '%s has no listed contributions for the %s plugin %s' %\ return '%s has no listed contributions for the %s plugin.' % \
(fullName, cb.name()) (fullName, cb.name())
# First we need to check and see if the requested plugin is loaded # First we need to check and see if the requested plugin is loaded
module = sys.modules[cb.__class__.__module__] module = sys.modules[cb.__class__.__module__]