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

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

View file

@ -42,9 +42,9 @@ class InaBackend(BaseBackend, ICapVideo):
def get_video(self, _id):
return self.browser.get_video(_id)
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):
with self.browser:
return self.browser.iter_search_results(pattern)
return self.browser.search_videos(pattern)
def fill_video(self, video, fields):
return video

View file

@ -41,7 +41,7 @@ class InaBrowser(BaseBrowser):
self.location(url)
return self.page.get_video(video)
def iter_search_results(self, pattern):
def search_videos(self, pattern):
self.location(self.buildurl('http://boutique.ina.fr/recherche/recherche', search=pattern.encode('utf-8')))
assert self.is_on_page(SearchPage)
return self.page.iter_videos()

View file

@ -24,7 +24,7 @@ class INATest(BackendTest):
BACKEND = 'ina'
def test_ina(self):
l = list(self.backend.iter_search_results('chirac'))
l = list(self.backend.search_videos('chirac'))
self.assertTrue(len(l) > 0)
v = l[0]
self.backend.fillobj(v, ('url',))