nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename iter_search_results to either search_videos and search_gallery (closes #779)

Browse source
This commit is contained in:
Romain Bignon 2012-03-12 16:18:14 +01:00
commit 56691d7ea7
39 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/youjizz/backend.py
View file

@ -44,11 +44,11 @@ class YoujizzBackend(BaseBackend, ICapVideo):
video = self.browser.get_video(_id)
return video
def iter_search_results(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False, max_results=None):
def search_videos(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False, max_results=None):
if not nsfw:
return set()
with self.browser:
return self.browser.iter_search_results(pattern)
return self.browser.search_videos(pattern)
def fill_video(self, video, fields):
if fields != ['thumbnail']:

2
modules/youjizz/browser.py
View file

@ -46,7 +46,7 @@ class YoujizzBrowser(BaseBrowser):
assert self.is_on_page(VideoPage), 'Should be on video page.'
return self.page.get_video(video)
def iter_search_results(self, pattern):
def search_videos(self, pattern):
if not pattern:
self.home()
else:

4
modules/youjizz/test.py
View file

@ -24,9 +24,9 @@ class YoujizzTest(BackendTest):
BACKEND = 'youjizz'
def test_youjizz(self):
self.assertTrue(len(self.backend.iter_search_results('anus', nsfw=False)) == 0)
self.assertTrue(len(self.backend.search_videos('anus', nsfw=False)) == 0)
l = list(self.backend.iter_search_results('sex', nsfw=True))
l = list(self.backend.search_videos('sex', nsfw=True))
self.assertTrue(len(l) > 0)
v = l[0]
self.backend.fillobj(v, ('url',))