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

Merge pull request #1034 from GLolol/google-1 

Google: show the API's real error message instead of a generic error
This commit is contained in:
Valentin Lorentz 2015-01-31 08:17:57 +01:00
parent cffdfd4286 c99dab4df4
commit 644ea99524
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/Google/plugin.py
View File

@ -122,7 +122,8 @@ class Google(callbacks.PluginRegexp):
headers=headers).decode('utf8')
data = json.loads(text)
if data['responseStatus'] != 200:
raise callbacks.Error(_('We broke The Google!'))
self.log.info("Google: unhandled error message: ", text)
raise callbacks.Error(data['responseDetails'])
return data
def formatData(self, data, bold=True, max=0, onetoone=False):
@ -187,9 +188,6 @@ class Google(callbacks.PluginRegexp):
conf.supybot.plugins.Google.safesearch.validStrings:
irc.errorInvalid('language')
data = self.search(text, msg.args[0], dict(optlist))
if data['responseStatus'] != 200:
irc.reply(_('We broke The Google!'))
return
bold = self.registryValue('bold', msg.args[0])
max = self.registryValue('maximumResults', msg.args[0])
# We don't use supybot.reply.oneToOne here, because you generally