From d16a44ffbd42634abf53ffb69c28d6951186afff Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Fri, 16 Apr 2010 18:04:57 +0200 Subject: [PATCH] remove tostring() from Browser --- weboob/backends/dlfp/pages/news.py | 6 +++--- weboob/tools/browser.py | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/weboob/backends/dlfp/pages/news.py b/weboob/backends/dlfp/pages/news.py index d98eac4d..81390b37 100644 --- a/weboob/backends/dlfp/pages/news.py +++ b/weboob/backends/dlfp/pages/news.py @@ -46,7 +46,7 @@ class Comment(object): self.author = sub.find('a').text self.date = self.parse_date(sub.find('i').tail) self.score = int(sub.findall('i')[1].find('span').text) - self.body = self.browser.tostring(sub.find('p')) + self.body = self.browser.parser.tostring(sub.find('p')) elif sub.attrib.get('class', '') == 'commentsul': comment = Comment(self.browser, sub.find('li'), self.id) self.comments.append(comment) @@ -88,7 +88,7 @@ class Article(object): date_s = unicode(div.find('i').tail) #print date_s if div.attrib.get('class', '').startswith('bodydiv '): - self.body = self.browser.tostring(div) + self.body = self.browser.parser.tostring(div) def append_comment(self, comment): self.comments.append(comment) @@ -100,7 +100,7 @@ class Article(object): yield c def parse_part2(self, div): - self.part2 = self.browser.tostring(div) + self.part2 = self.browser.parser.tostring(div) class ContentPage(DLFPPage): def on_loaded(self): diff --git a/weboob/tools/browser.py b/weboob/tools/browser.py index 6cbea783..13af894d 100644 --- a/weboob/tools/browser.py +++ b/weboob/tools/browser.py @@ -249,12 +249,6 @@ class BaseBrowser(mechanize.Browser): if self.__cookie: self.__cookie.save() - def tostring(self, elem): - """ - Get HTML string from document. - """ - return self.__parser.dump(elem) - def str(self, s): if isinstance(s, unicode): s = s.encode('iso-8859-15', 'replace')