simplify and factorize code, remove dead code, follow conventions, use new-style classes

weboob/backends/canalplus/backend.py

@@ -25,6 +25,7 @@ from weboob.tools.value import ValuesDict, Value
 from .browser import CanalplusBrowser
 from .pages import CanalplusVideo
 
+
 __all__ = ['CanalplusBackend']
 
 
@@ -57,7 +58,6 @@ class CanalplusBackend(BaseBackend, ICapVideo):
         if 'thumbnail' in fields:
             with self.browser:
                 video.thumbnail.data = self.browser.readurl(video.thumbnail.url)
-
         return video
 
     OBJECTS = {CanalplusVideo: fill_video}

weboob/backends/canalplus/browser.py

@@ -15,16 +15,21 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+
 import urllib
 
+import lxml.etree
+
 from weboob.tools.browser import BaseBrowser
 from weboob.tools.browser.decorators import id2url
 
 from .pages import InitPage, CanalplusVideo, VideoPage
 
-import lxml.etree
 
-class XMLParser:
+__all__ = ['CanalplusBrowser']
+
+
+class XMLParser(object):
      def parse(self, data, encoding=None):
         if encoding is None:
             parser = None
@@ -33,22 +38,21 @@ class XMLParser:
         return lxml.etree.XML(data.get_data(), parser)
 
 
-__all__ = ['CanalplusBrowser']
-
-
 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/search/cplus/.*": VideoPage,
-             r"http://service.canal-plus.com/video/rest/getVideosLiees/cplus/(?P<id>.+)": VideoPage,
-    }
+    PAGES = {
+        r'http://service.canal-plus.com/video/rest/initPlayer/cplus/': InitPage,
+        r'http://service.canal-plus.com/video/rest/search/cplus/.*': VideoPage,
+        r'http://service.canal-plus.com/video/rest/getVideosLiees/cplus/(?P<id>.+)': VideoPage,
+        }
 
     #We need lxml.etree.XMLParser for read CDATA
     PARSER = XMLParser()
-    FORMATS = { 'sd': 'BAS_DEBIT',
-                'hd': 'HD'
-                }
+    FORMATS = {
+        'sd': 'BAS_DEBIT',
+        'hd': 'HD',
+        }
 
     def __init__(self, quality, *args, **kwargs):
         BaseBrowser.__init__(self, parser= self.PARSER, *args, **kwargs)
@@ -58,15 +62,13 @@ class CanalplusBrowser(BaseBrowser):
             self.quality = 'HD'
 
     def home(self):
-        self.location("http://service.canal-plus.com/video/rest/initPlayer/cplus/")
+        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))
         return self.page.iter_results()
 
     @id2url(CanalplusVideo.id2url)
     def get_video(self, url, video=None):
         self.location(url)
         return self.page.get_video(video, self.quality)
-
-

weboob/backends/canalplus/pages/initpage.py

@@ -15,26 +15,28 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+
 from weboob.tools.browser import BasePage
 
+
 __all__ = ['InitPage']
 
+
 class InitPage(BasePage):
-	def on_loaded(self):
-		channels = []
-		### Parse liste des channels
-		for elem in self.document[2].getchildren():
-			channel = {}
-			for e in elem.getchildren():
-				subchannels = []
-				if e.tag == "NOM":
-					channel['nom'] = e.text
-				elif e.tag == "SELECTIONS":
-			
-					for select in e:
-						subchannel = {}
-						subchannel['id'] = select[0].text
-						subchannel['nom'] = select[1].text
-						subchannels.append(subchannel)
-			channel['subchannels'] = subchannels
-			channels.append(channel)
+    def on_loaded(self):
+        channels = []
+        ### Parse liste des channels
+        for elem in self.document[2].getchildren():
+            channel = {}
+            for e in elem.getchildren():
+                subchannels = []
+                if e.tag == "NOM":
+                    channel['nom'] = e.text
+                elif e.tag == "SELECTIONS":
+                    for select in e:
+                        subchannel = {}
+                        subchannel['id'] = select[0].text
+                        subchannel['nom'] = select[1].text
+                        subchannels.append(subchannel)
+            channel['subchannels'] = subchannels
+            channels.append(channel)