factorise code closes #509

This commit is contained in:
Juke 2011-02-20 00:02:53 +01:00 committed by Romain Bignon
commit c746dcd01d
2 changed files with 4 additions and 16 deletions

View file

@ -17,7 +17,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from weboob.tools.parsers.lxmlparser import select, SelectElementException from weboob.tools.parsers.lxmlparser import select, SelectElementException
from .genericArticle import GenericNewsPage, NoAuthorElement from .genericArticle import NoAuthorElement
from .simple import SimplePage
def try_remove(base_element, selector): def try_remove(base_element, selector):
try : try :
@ -25,12 +26,8 @@ def try_remove(base_element, selector):
except (SelectElementException, ValueError): except (SelectElementException, ValueError):
pass pass
class ArticlePage(GenericNewsPage): class ArticlePage(SimplePage):
"ArticlePage object for minutes20" "ArticlePage object for minutes20"
def on_loaded(self):
self.main_div = self.document.getroot()
self.element_author_selector = "div.mna-signature"
self.element_body_selector = "div.mna-body"
def get_body(self): def get_body(self):
element_body = self.get_element_body() element_body = self.get_element_body()
@ -41,5 +38,3 @@ class ArticlePage(GenericNewsPage):
except NoAuthorElement: except NoAuthorElement:
pass pass
return self.browser.parser.tostring(element_body) return self.browser.parser.tostring(element_body)

View file

@ -16,14 +16,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from weboob.tools.parsers.lxmlparser import select, SelectElementException from .genericArticle import GenericNewsPage
from .genericArticle import GenericNewsPage, NoAuthorElement
def try_remove(base_element, selector):
try :
base_element.remove(select(base_element, selector, 1 ))
except (SelectElementException, ValueError):
pass
class SimplePage(GenericNewsPage): class SimplePage(GenericNewsPage):
"ArticlePage object for minutes20" "ArticlePage object for minutes20"