From 657e8fe4074018497706389aafdfaae0401f6913 Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Wed, 2 Jun 2010 17:46:17 +0200 Subject: [PATCH] bcall adds suffix to object, not the backend itself --- weboob/backends/youjizz/video.py | 4 ---- weboob/backends/youporn/video.py | 4 ---- weboob/backends/youtube/video.py | 4 ---- weboob/bcall.py | 1 + 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/weboob/backends/youjizz/video.py b/weboob/backends/youjizz/video.py index 3bd55675..a6ff82e6 100644 --- a/weboob/backends/youjizz/video.py +++ b/weboob/backends/youjizz/video.py @@ -23,10 +23,6 @@ __all__ = ['YoujizzVideo'] class YoujizzVideo(BaseVideo): - def __init__(self, *args, **kwargs): - BaseVideo.__init__(self, *args, **kwargs) - self.id = u'%s@youjizz.com' % self.id - @classmethod def id2url(cls, _id): return 'http://www.youjizz.com/videos/%s.html' % _id diff --git a/weboob/backends/youporn/video.py b/weboob/backends/youporn/video.py index 70250d18..dfdb8072 100644 --- a/weboob/backends/youporn/video.py +++ b/weboob/backends/youporn/video.py @@ -23,10 +23,6 @@ __all__ = ['YoupornVideo'] class YoupornVideo(BaseVideo): - def __init__(self, *args, **kwargs): - BaseVideo.__init__(self, *args, **kwargs) - self.id = u'%s@youporn.com' % self.id - @classmethod def id2url(cls, _id): if _id.isdigit(): diff --git a/weboob/backends/youtube/video.py b/weboob/backends/youtube/video.py index 5a03cda9..a2176c64 100644 --- a/weboob/backends/youtube/video.py +++ b/weboob/backends/youtube/video.py @@ -23,10 +23,6 @@ __all__ = ['YoutubeVideo'] class YoutubeVideo(BaseVideo): - def __init__(self, *args, **kwargs): - BaseVideo.__init__(self, *args, **kwargs) - self.id = u'%s@youtube.com' % self.id - @classmethod def id2url(cls, _id): return 'http://www.youtube.com/watch?v=%s' % _id diff --git a/weboob/bcall.py b/weboob/bcall.py index 12e0efda..991b1e42 100644 --- a/weboob/bcall.py +++ b/weboob/bcall.py @@ -77,6 +77,7 @@ class BackendsCall(object): def _store_result(self, backend, result): with self.mutex: + result.id = unicode(result.id) + '@' + backend.name self.responses.append((backend, result)) self.response_event.set()