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

Simplify presseurop code

Browse source
This commit is contained in:
Florent 2012-11-07 18:15:55 +01:00
commit a6e80a2206
2 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/presseurop/browser.py
View file

@ -18,7 +18,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from .pages.article import ArticlePage, CartoonPage from .pages.article import PresseuropPage, CartoonPage
from weboob.tools.browser import BaseBrowser from weboob.tools.browser import BaseBrowser
@ -26,7 +26,7 @@ class NewspaperPresseuropBrowser(BaseBrowser):
"NewspaperPresseuropBrowser class" "NewspaperPresseuropBrowser class"
PAGES = { PAGES = {
"http://www.presseurop.eu/.*/cartoon/.*": CartoonPage, "http://www.presseurop.eu/.*/cartoon/.*": CartoonPage,
"http://www.presseurop.eu/.*": ArticlePage, "http://www.presseurop.eu/.*": PresseuropPage,
} }
def is_logged(self): def is_logged(self):

17
modules/presseurop/pages/article.py
View file

@ -21,8 +21,8 @@
from weboob.tools.capabilities.messages.genericArticle import GenericNewsPage, try_drop_tree from weboob.tools.capabilities.messages.genericArticle import GenericNewsPage, try_drop_tree
class ArticlePage(GenericNewsPage): class PresseuropPage(GenericNewsPage):
"ArticlePage object for presseurop" "PresseuropPage object for presseurop"
def on_loaded(self): def on_loaded(self):
self.main_div = self.document.getroot() self.main_div = self.document.getroot()
@ -43,7 +43,7 @@ class ArticlePage(GenericNewsPage):
return title return title
class CartoonPage(GenericNewsPage): class CartoonPage(PresseuropPage):
"CartoonPage object for presseurop" "CartoonPage object for presseurop"
def on_loaded(self): def on_loaded(self):
@ -51,14 +51,3 @@ class CartoonPage(GenericNewsPage):
self.element_title_selector = "title" self.element_title_selector = "title"
self.element_author_selector = "div.profilecartoontext>p>a" self.element_author_selector = "div.profilecartoontext>p>a"
self.element_body_selector = "div.panel" self.element_body_selector = "div.panel"
def get_body(self):
element_body = self.get_element_body()
try_drop_tree(self.parser, element_body, "li.button-social")
try_drop_tree(self.parser, element_body, "div.sharecount")
return self.parser.tostring(element_body)
def get_title(self):
title = GenericNewsPage.get_title(self)
title = title.split('|')[0]
return title