Google: Decode URLs. Closes GH-1260.

plugins/Google/plugin.py

@@ -82,7 +82,7 @@ class Google(callbacks.PluginRegexp):
         results = []
         for match in matches:
             r = dict(zip(('url', 'title', 'cacheUrl', 'content'), match))
-            r['url'] = utils.web.htmlToText(r['url'].split('&')[0])
+            r['url'] = utils.web.urlunquote(utils.web.htmlToText(r['url'].split('&')[0]))
             results.append(r)
         return results
 

plugins/Google/test.py

@@ -54,6 +54,12 @@ class GoogleTestCase(ChannelPluginTestCase):
             # Unicode check
             self.assertNotError('google ae')
 
+        def testUrlDecode(self):
+            self.assertRegexp(
+                    'google site:http://www.urbandictionary.com carajo land',
+                    '\x02Urban Dictionary: carajo land\x02: '
+                    'https?://www.urbandictionary.com/define.php\?term=carajo%20land')
+
         def testLucky(self):
             self.assertResponse('lucky Hacker News',
                     'https://news.ycombinator.com/')