factorise

weboob/backends/minutes20/browser.py

@@ -45,11 +45,7 @@ class Newspaper20minutesBrowser(BaseBrowser):
             url = id2url(_id)
         except ValueError:
             url = _id
-        try:
-            self.location(url)
-        except IndexError:
-            if _id == '':
-                raise ValueError("thread id is empty")
-            else:
-                raise
-        return self.page.get_article(_id)
+        self.location(url)
+
+        if self.page is not None:
+            return self.page.get_article(_id)

weboob/backends/minutes20/pages/article.py

@@ -21,6 +21,11 @@ from .simple import SimplePage
 
 class ArticlePage(SimplePage):
     "ArticlePage object for minutes20"
+    def on_loaded(self):
+        self.main_div = self.document.getroot()
+        self.element_title_selector = "h1"
+        self.element_author_selector = "div.mna-signature"
+        self.element_body_selector = "div.mna-body"
 
     def get_body(self):
         element_body = self.get_element_body()
@@ -32,9 +37,3 @@ class ArticlePage(SimplePage):
             pass
         return self.browser.parser.tostring(element_body)
 
-    def on_loaded(self):
-        self.main_div = self.document.getroot()
-        self.element_author_selector = "div.mna-signature"
-        self.element_body_selector = "div.mna-body"
-        self.element_title_selector = "h1"
-    

weboob/backends/minutes20/pages/simple.py

@@ -18,13 +18,11 @@
 
 from weboob.tools.genericArticle import GenericNewsPage
 
-
 class SimplePage(GenericNewsPage):
     "ArticlePage object for minutes20"
     def on_loaded(self):
         self.main_div = self.document.getroot()
+        self.element_title_selector = "h1"
         self.element_author_selector = "div.mna-signature"
         self.element_body_selector = "div.mna-body"
-        self.element_title_selector = "h1"
 
-