From 98235d7719c59d03e3e00c6e1c643f89e4e2e61a Mon Sep 17 00:00:00 2001
From: Julien Veyssier <julien.veyssier@aiur.fr>
Date: Sun, 10 Mar 2013 23:59:04 +0100
Subject: [PATCH] [opensub] encoding corrections and test fix

---
 modules/opensubtitles/pages.py | 16 ++++++++--------
 modules/opensubtitles/test.py  | 17 +++++++++--------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/modules/opensubtitles/pages.py b/modules/opensubtitles/pages.py
index 21cd7805..5576e91a 100644
--- a/modules/opensubtitles/pages.py
+++ b/modules/opensubtitles/pages.py
@@ -100,26 +100,26 @@ class SubtitlePage(BasePage):
         father = self.parser.select(self.document.getroot(),'a#app_link',1).getparent()
         a = self.parser.select(father,'a')[1]
         id = a.attrib.get('href','').split('/')[-1]
-        url = "http://www.opensubtitles.org/subtitleserve/sub/%s"%id
+        url = unicode('http://www.opensubtitles.org/subtitleserve/sub/%s'%id)
         link = self.parser.select(self.document.getroot(),'link[rel=bookmark]',1)
-        title = link.attrib.get('title','')
+        title = unicode(link.attrib.get('title',''))
         nb_cd = int(title.lower().split('cd')[0].split()[-1])
-        lang = title.split('(')[1].split(')')[0]
+        lang = unicode(title.split('(')[1].split(')')[0])
         file_names = self.parser.select(self.document.getroot(),"img[title~=filename]")
         if len(file_names) > 0:
             file_name = file_names[0].getparent().text_content()
-            file_name = " ".join(file_name.split())
-            desc = u"files :"
+            file_name = ' '.join(file_name.split())
+            desc = u'files :'
             for f in file_names:
                 desc_line = f.getparent().text_content()
-                desc += "\n"+" ".join(desc_line.split())
-        name = "%s (%s)"%(title,file_name)
+                desc += '\n'+' '.join(desc_line.split())
+        name = unicode('%s (%s)'%(title,file_name))
 
         subtitle = Subtitle(id,name)
         subtitle.url = url
         for lshort,llong in LANGUAGE_CONV.items():
             if lang == llong:
-                lang = lshort
+                lang = unicode(lshort)
                 break
         subtitle.language = lang
         subtitle.nb_cd = nb_cd
diff --git a/modules/opensubtitles/test.py b/modules/opensubtitles/test.py
index eeac33dd..be484df2 100644
--- a/modules/opensubtitles/test.py
+++ b/modules/opensubtitles/test.py
@@ -19,20 +19,21 @@
 
 from weboob.tools.test import BackendTest
 
-import urllib
 from random import choice
 
 class OpensubtitlesTest(BackendTest):
     BACKEND = 'opensubtitles'
 
     def test_subtitle(self):
-        subtitles = list(self.backend.iter_subtitles('fr','spiderman'))
-        assert (len(subtitles) > 0)
-        for subtitle in subtitles:
-            path, qs = urllib.splitquery(subtitle.url)
-            assert path.endswith('.zip')
+        lsub = []
+        subtitles = self.backend.iter_subtitles('fr','spiderman')
+        for i in range(5):
+            subtitle = subtitles.next()
+            lsub.append(subtitle)
+            assert subtitle.url.startswith('http')
+        assert (len(lsub) > 0)
 
         # get the file of a random sub
-        if len(subtitles):
-            subtitle = choice(subtitles)
+        if len(lsub):
+            subtitle = choice(lsub)
             self.backend.get_subtitle_file(subtitle.id)