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

Move all canalplus pages in one file

Browse source 
There isn't enough code to justify multiple files.
Also includes pep8 fixes.
This commit is contained in:
Laurent Bachelier 2012-03-09 03:39:53 +01:00
commit ec689b1e7f
4 changed files with 29 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/canalplus/browser.py
View file

@ -25,7 +25,7 @@ import lxml.etree
from weboob.tools.browser import BaseBrowser
from weboob.tools.browser.decorators import id2url
from .pages import InitPage, VideoPage
from .pages import ChannelsPage, VideoPage
from .video import CanalplusVideo
from weboob.capabilities.collection import CollectionNotFound
@ -46,7 +46,7 @@ class CanalplusBrowser(BaseBrowser):
DOMAIN = u'service.canal-plus.com'
ENCODING = 'utf-8'
PAGES = {
r'http://service.canal-plus.com/video/rest/initPlayer/cplus/': InitPage,
r'http://service.canal-plus.com/video/rest/initPlayer/cplus/': ChannelsPage,
r'http://service.canal-plus.com/video/rest/search/cplus/.*': VideoPage,
r'http://service.canal-plus.com/video/rest/getVideosLiees/cplus/(?P<id>.+)': VideoPage,
r'http://service.canal-plus.com/video/rest/getMEAs/cplus/.*': VideoPage,
@ -76,7 +76,7 @@ class CanalplusBrowser(BaseBrowser):
return self.page.get_video(video, self.quality)
def iter_resources(self, split_path):
if not self.is_on_page(InitPage):
if not self.is_on_page(ChannelsPage):
self.home()
channels = self.page.get_channels()