Merge branch 'py3k-backport' into testing

2013-01-06 16:46:29 +01:00 · 2013-01-06 16:46:29 +01:00 · 7e0d868db1
parent 755a1c9491 df62ddad78
commit 7e0d868db1
1 changed files with 4 additions and 1 deletions
--- a/plugins/Google/plugin.py
+++ b/plugins/Google/plugin.py
@ -29,6 +29,7 @@
 ###

 import re
+import sys
 import cgi
 import time
 import socket
@ -130,7 +131,9 @@ class Google(callbacks.PluginRegexp):
        for result in data:
            title = utils.web.htmlToText(result['titleNoFormatting']\
                                         .encode('utf-8'))
-            url = result['unescapedUrl'].encode('utf-8')
+            url = result['unescapedUrl']
+            if sys.version_info[0] < 3:
+                url = url.encode('utf-8')
            if title:
                if bold:
                    title = ircutils.bold(title)