From 8155b0b2891f0638ab88fb4a5fcd522036b72891 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Tue, 3 May 2011 16:44:39 +0200 Subject: [PATCH] fix unicode issues --- weboob/backends/arte/browser.py | 2 +- weboob/backends/canalplus/browser.py | 2 +- weboob/backends/dailymotion/browser.py | 4 ++-- weboob/backends/gazelle/browser.py | 2 +- weboob/backends/ina/browser.py | 2 +- weboob/backends/isohunt/browser.py | 2 +- weboob/backends/kickass/browser.py | 2 +- weboob/backends/piratebay/browser.py | 2 +- weboob/backends/youjizz/browser.py | 2 +- weboob/backends/youporn/browser.py | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/weboob/backends/arte/browser.py b/weboob/backends/arte/browser.py index f7073a3a..47e1fbae 100644 --- a/weboob/backends/arte/browser.py +++ b/weboob/backends/arte/browser.py @@ -60,6 +60,6 @@ class ArteBrowser(BaseBrowser): if not pattern: self.home() else: - self.location(self.buildurl('/%s/do_search/videos/%s' % (self.lang, self.SEARCH_LANG[self.lang]), q=pattern)) + self.location(self.buildurl('/%s/do_search/videos/%s' % (self.lang, self.SEARCH_LANG[self.lang]), q=pattern.encode('utf-8'))) assert self.is_on_page(IndexPage) return self.page.iter_videos() diff --git a/weboob/backends/canalplus/browser.py b/weboob/backends/canalplus/browser.py index 6c78d5b3..d65f7313 100644 --- a/weboob/backends/canalplus/browser.py +++ b/weboob/backends/canalplus/browser.py @@ -69,7 +69,7 @@ class CanalplusBrowser(BaseBrowser): self.location('http://service.canal-plus.com/video/rest/initPlayer/cplus/') def iter_search_results(self, pattern): - self.location('http://service.canal-plus.com/video/rest/search/cplus/' + urllib.quote_plus(pattern)) + self.location('http://service.canal-plus.com/video/rest/search/cplus/' + urllib.quote_plus(pattern.encode('utf-8'))) return self.page.iter_results() @id2url(CanalplusVideo.id2url) diff --git a/weboob/backends/dailymotion/browser.py b/weboob/backends/dailymotion/browser.py index 697fc17e..62421d82 100644 --- a/weboob/backends/dailymotion/browser.py +++ b/weboob/backends/dailymotion/browser.py @@ -47,9 +47,9 @@ class DailymotionBrowser(BaseBrowser): self.home() else: if sortby is None: - url = '/search/%s/1' % quote_plus(pattern) + url = '/search/%s/1' % quote_plus(pattern.encode('utf-8')) else: - url = '/%s/search/%s/1' % (sortby, quote_plus(pattern)) + url = '/%s/search/%s/1' % (sortby, quote_plus(pattern.encode('utf-8'))) self.location(url) assert self.is_on_page(IndexPage) diff --git a/weboob/backends/gazelle/browser.py b/weboob/backends/gazelle/browser.py index e1dc3a46..a199e663 100644 --- a/weboob/backends/gazelle/browser.py +++ b/weboob/backends/gazelle/browser.py @@ -58,7 +58,7 @@ class GazelleBrowser(BaseBrowser): return self.location('%s://%s/login.php' % (self.PROTOCOL, self.DOMAIN)) def iter_torrents(self, pattern): - self.location(self.buildurl('/torrents.php', searchstr=pattern)) + self.location(self.buildurl('/torrents.php', searchstr=pattern.encode('utf-8'))) assert self.is_on_page(TorrentsPage) return self.page.iter_torrents() diff --git a/weboob/backends/ina/browser.py b/weboob/backends/ina/browser.py index 8f589422..0b50c20f 100644 --- a/weboob/backends/ina/browser.py +++ b/weboob/backends/ina/browser.py @@ -41,6 +41,6 @@ class InaBrowser(BaseBrowser): return self.page.get_video(video) def iter_search_results(self, pattern): - self.location(self.buildurl('/recherche/recherche', search=pattern)) + self.location(self.buildurl('/recherche/recherche', search=pattern.encode('utf-8'))) assert self.is_on_page(SearchPage) return self.page.iter_videos() diff --git a/weboob/backends/isohunt/browser.py b/weboob/backends/isohunt/browser.py index 86177afa..51b436cc 100644 --- a/weboob/backends/isohunt/browser.py +++ b/weboob/backends/isohunt/browser.py @@ -40,7 +40,7 @@ class IsohuntBrowser(BaseBrowser): return self.location('https://isohunt.com') def iter_torrents(self, pattern): - self.location('https://isohunt.com/torrents/%s?iht=-1&ihp=1&ihs1=1&iho1=d' % pattern) + self.location('https://isohunt.com/torrents/%s?iht=-1&ihp=1&ihs1=1&iho1=d' % pattern.encode('utf-8')) assert self.is_on_page(TorrentsPage) return self.page.iter_torrents() diff --git a/weboob/backends/kickass/browser.py b/weboob/backends/kickass/browser.py index 56b51558..8eee75b8 100644 --- a/weboob/backends/kickass/browser.py +++ b/weboob/backends/kickass/browser.py @@ -40,7 +40,7 @@ class KickassBrowser(BaseBrowser): return self.location('http://kickasstorrents.com') def iter_torrents(self, pattern): - self.location('http://fr.kickasstorrents.com/new/?q=%s&field=seeders&sorder=desc' % pattern) + self.location('http://fr.kickasstorrents.com/new/?q=%s&field=seeders&sorder=desc' % pattern.encode('utf-8')) assert self.is_on_page(TorrentsPage) return self.page.iter_torrents() diff --git a/weboob/backends/piratebay/browser.py b/weboob/backends/piratebay/browser.py index e09be3c3..51c8cc9d 100644 --- a/weboob/backends/piratebay/browser.py +++ b/weboob/backends/piratebay/browser.py @@ -63,7 +63,7 @@ class PiratebayBrowser(BaseBrowser): def iter_torrents(self, pattern): #self.location(self.buildurl('/torrents.php', searchstr=pattern)) - self.location('https://thepiratebay.org/search/%s/0/7/0' % pattern) + self.location('https://thepiratebay.org/search/%s/0/7/0' % pattern.encode('utf-8')) assert self.is_on_page(TorrentsPage) return self.page.iter_torrents() diff --git a/weboob/backends/youjizz/browser.py b/weboob/backends/youjizz/browser.py index b0725e2f..10bc61d4 100644 --- a/weboob/backends/youjizz/browser.py +++ b/weboob/backends/youjizz/browser.py @@ -50,6 +50,6 @@ class YoujizzBrowser(BaseBrowser): if not pattern: self.home() else: - self.location('/search/%s-1.html' % (urllib.quote_plus(pattern))) + self.location('/search/%s-1.html' % (urllib.quote_plus(pattern.encode('utf-8')))) assert self.is_on_page(IndexPage) return self.page.iter_videos() diff --git a/weboob/backends/youporn/browser.py b/weboob/backends/youporn/browser.py index 07be55bb..3be126f0 100644 --- a/weboob/backends/youporn/browser.py +++ b/weboob/backends/youporn/browser.py @@ -47,6 +47,6 @@ class YoupornBrowser(BaseBrowser): if not pattern: self.home() else: - self.location(self.buildurl('/search/%s' % sortby, query=pattern)) + self.location(self.buildurl('/search/%s' % sortby, query=pattern.encode('utf-8'))) assert self.is_on_page(IndexPage) return self.page.iter_videos()