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

fix no-author closes #478

Browse source
This commit is contained in:
Juke 2011-02-08 01:44:36 +01:00
commit d41733628d
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
weboob/backends/minutes20/pages/article.py
View file

@ -17,19 +17,18 @@
from weboob.tools.parsers.lxmlparser import select, SelectElementException from weboob.tools.parsers.lxmlparser import select, SelectElementException
from .minutes20 import Minutes20Page from .minutes20 import Minutes20Page, NoAuthorElement
class ArticlePage(Minutes20Page): class ArticlePage(Minutes20Page):
def set_body(self): def set_body(self):
self.element_body = select(self.main_div, "div.mna-body", 1) self.element_body = select(self.main_div, "div.mna-body", 1)
self.element_body.remove(select(self.element_body, "div.mna-tools", 1)) self.element_body.remove(select(self.element_body, "div.mna-tools", 1))
try: try:
self.element_body.remove(select(self.element_body, "div.mna-comment-call", 1)) self.element_body.remove(select(self.element_body, "div.mna-comment-call", 1))
except SelectElementException: except SelectElementException:
pass pass
try:
self.element_body.remove(self.get_element_author()) self.element_body.remove(self.get_element_author())
except NoAuthorElement:
pass
self.article.body = self.browser.parser.tostring(self.element_body) self.article.body = self.browser.parser.tostring(self.element_body)

16
weboob/backends/minutes20/pages/minutes20.py
View file

@ -16,10 +16,12 @@
# 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.browser import BasePage from weboob.tools.browser import BasePage
from weboob.tools.parsers.lxmlparser import select from weboob.tools.parsers.lxmlparser import select, SelectElementException
__all__ = ['Minutes20Page', 'Article'] __all__ = ['Minutes20Page', 'Article', 'NoAuthorElement']
class NoAuthorElement(Exception):
pass
class Article(object): class Article(object):
def __init__(self): def __init__(self):
@ -37,7 +39,10 @@ class Minutes20Page(BasePage):
self.article.author = self.get_element_author().text_content().strip() self.article.author = self.get_element_author().text_content().strip()
def get_element_author(self): def get_element_author(self):
return select(self.main_div, "div.mna-signature", 1) try :
return select(self.main_div, "div.mna-signature", 1)
except SelectElementException:
raise NoAuthorElement()
def set_body(self): def set_body(self):
self.article.body = self.browser.parser.tostring(select(self.main_div, "div.mna-body", 1)) self.article.body = self.browser.parser.tostring(select(self.main_div, "div.mna-body", 1))
@ -47,7 +52,10 @@ class Minutes20Page(BasePage):
self.article = Article() self.article = Article()
self.main_div = self.document.getroot() self.main_div = self.document.getroot()
self.article.title = select(self.main_div, "h1", 1).text_content() self.article.title = select(self.main_div, "h1", 1).text_content()
self.set_author() try :
self.set_author()
except NoAuthorElement:
pass
self.set_body() self.set_body()