Merge branch 'master' into testing

This commit is contained in:
Valentin Lorentz 2012-03-08 18:53:37 +00:00
commit 4e7cec2b8e

View File

@ -351,7 +351,7 @@ class Google(callbacks.PluginRegexp):
js = simplejson.loads(js) js = simplejson.loads(js)
if js['error'] == '': if js['error'] == '':
irc.reply("%s = %s" % (js['lhs'], js['rhs'],)) irc.reply("%s = %s" % (js['lhs'].encode('utf8'), js['rhs'].encode('utf8'),))
return return
url = self._googleUrl(expr) url = self._googleUrl(expr)