[Search engine] Fix Python 2 encoding problems

src/searchengine/nova/engines/torrentz.py

@@ -1,4 +1,4 @@
-#VERSION: 2.17
+#VERSION: 2.18
 #AUTHORS: Diego de las Heras (ngosang@hotmail.es)
 
 # Redistribution and use in source and binary forms, with or without
@@ -92,8 +92,8 @@ class torrentz(object):
                 # display item
                 self.td_counter = None
                 self.current_item['engine_url'] = self.url
-                if self.current_item['name'].find(' \xc2'):
+                if self.current_item['name'].find(u' \xc2'):
-                    self.current_item['name'] = self.current_item['name'].split(' \xc2')[0]
+                    self.current_item['name'] = self.current_item['name'].split(u' \xc2')[0]
                 self.current_item['link'] += '&' + urlencode({'dn' : self.current_item['name']})
                 self.current_item['name'] = self.current_item['name'].decode('utf8')
 

src/searchengine/nova/engines/versions.txt

@@ -6,4 +6,4 @@ legittorrents: 2.00
 mininova: 2.01
 piratebay: 2.14
 torrentreactor: 1.41
-torrentz: 2.17
+torrentz: 2.18

src/searchengine/nova/helpers.py

@@ -1,7 +1,9 @@
-#VERSION: 1.40
+#VERSION: 1.41
 
 # Author:
 #  Christophe DUMEZ (chris@qbittorrent.org)
+# Contributors:
+#  Diego de las Heras (ngosang@hotmail.es)
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -86,7 +88,7 @@ def retrieve_url(url):
         pass
     dat = dat.decode(charset, 'replace')
     dat = htmlentitydecode(dat)
-    return dat.encode('utf-8', 'replace')
+    return dat
 
 def download_file(url, referer=None):
     """ Download file at url and write it to a file, return the path to the file and the url """