Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 13:19:24 +01:00
Code Issues Projects Releases Wiki Activity

Changed some 'text' to 'something'

Browse Source
This commit is contained in:
Jeremy Fincher 2004-11-30 04:36:54 +00:00
parent 9ea98a5657
commit f9d82c7495
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/Google.py
View File

@ -121,9 +121,19 @@ def search(log, queries, **kwargs):
log.info('HTTP Error accessing Google: %s', e) log.info('HTTP Error accessing Google: %s', e)
raise callbacks.Error, 'Error connecting to Google.com.' raise callbacks.Error, 'Error connecting to Google.com.'
except SOAPpy.faultType, e: except SOAPpy.faultType, e:
if 'Invalid authorization key' not in e.faultstring: if 'Invalid authorization key' in e.faultstring:
raise callbacks.Error, 'Invalid Google license key.'
elif 'Problem looking up user record' in e.faultstring:
raise callbacks.Error, \
'Google seems to be having trouble looking up the user for '\
'your license key. This probably isn\'t a problem on your '\
'side; it\'s probably a bug on Google\'s side. It seems '\
'to happen intermittently.'
else:
log.exception('Unexpected SOAPpy error:') log.exception('Unexpected SOAPpy error:')
raise callbacks.Error, 'Invalid Google license key.' raise callbacks.Error, \
'Unexpected error from Google; please report this to the ' \
'Supybot developers.'
except xml.sax.SAXException, e: except xml.sax.SAXException, e:
log.exception('Uncaught SAX error:') log.exception('Uncaught SAX error:')
raise callbacks.Error, 'Google returned an unparsable response. ' \ raise callbacks.Error, 'Google returned an unparsable response. ' \
@ -277,7 +287,7 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
irc.reply(url) irc.reply(url)
else: else:
irc.reply('Google found nothing.') irc.reply('Google found nothing.')
lucky = wrap(lucky, [many('text')]) lucky = wrap(lucky, [many('something')])
def google(self, irc, msg, args, optlist, text): def google(self, irc, msg, args, optlist, text):
"""<search> [--{language,restrict}=<value>] [--{notsafe,similar}] """<search> [--{language,restrict}=<value>] [--{notsafe,similar}]
@ -315,7 +325,7 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
irc.reply(self.formatData(data, bold=bold, max=max)) irc.reply(self.formatData(data, bold=bold, max=max))
google = wrap(google, [getopts({'language':'text', 'restrict':'text', google = wrap(google, [getopts({'language':'text', 'restrict':'text',
'notsafe':'', 'similar':''}), 'notsafe':'', 'similar':''}),
many('text')]) many('something')])
def metagoogle(self, irc, msg, args, optlist, text): def metagoogle(self, irc, msg, args, optlist, text):
"""<search> [--(language,restrict)=<value>] [--{similar,notsafe}] """<search> [--(language,restrict)=<value>] [--{similar,notsafe}]
@ -350,7 +360,7 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
metagoogle = wrap(metagoogle, [getopts({'language':'text', metagoogle = wrap(metagoogle, [getopts({'language':'text',
'restrict':'text', 'restrict':'text',
'notsafe':'', 'similar':''}), 'notsafe':'', 'similar':''}),
many('text')]) many('something')])
_cacheUrlRe = re.compile('<code>([^<]+)</code>') _cacheUrlRe = re.compile('<code>([^<]+)</code>')
def cache(self, irc, msg, args, url): def cache(self, irc, msg, args, url):