move select() in parser

weboob/backends/arte/pages.py

@@ -22,7 +22,7 @@ import re
 import urllib
 
 from weboob.tools.browser import BasePage
-from weboob.tools.parsers.lxmlparser import select
+
 
 from .video import ArteVideo
 
@@ -40,13 +40,13 @@ class IndexPage(BasePage):
             if m:
                 _id = m.group(1)
             rating = rating_max = 0
-            rates = select(div, 'div[class=rateContainer]', 1)
+            rates = self.parser.select(div, 'div[class=rateContainer]', 1)
             for r in rates.findall('div'):
                 if 'star-rating-on' in r.attrib['class']:
                     rating += 1
                 rating_max += 1
 
-            thumb = select(div, 'img[class=thumbnail]', 1)
+            thumb = self.parser.select(div, 'img[class=thumbnail]', 1)
             thumbnail_url = 'http://videos.arte.tv' + thumb.attrib['src']
 
             yield ArteVideo(_id,
@@ -67,12 +67,12 @@ class VideoPage(BasePage):
         return self.document.getroot().cssselect('h2')[0].text
 
     def get_url(self, lang, quality):
-        obj = select(self.document.getroot(), 'object', 1)
+        obj = self.parser.select(self.document.getroot(), 'object', 1)
-        movie_url = select(obj, 'param[name=movie]', 1)
+        movie_url = self.parser.select(obj, 'param[name=movie]', 1)
         xml_url = urllib.unquote(movie_url.attrib['value'].split('videorefFileUrl=')[-1])
 
         doc = self.browser.get_document(self.browser.openurl(xml_url))
-        videos_list = select(doc.getroot(), 'video')
+        videos_list = self.parser.select(doc.getroot(), 'video')
         videos = {}
         for v in videos_list:
             videos[v.attrib['lang']] = v.attrib['ref']
@@ -84,8 +84,8 @@ class VideoPage(BasePage):
 
         doc = self.browser.get_document(self.browser.openurl(xml_url))
 
-        obj = select(doc.getroot(), 'urls', 1)
+        obj = self.parser.select(doc.getroot(), 'urls', 1)
-        videos_list = select(obj, 'url')
+        videos_list = self.parser.select(obj, 'url')
         urls = {}
         for v in videos_list:
             urls[v.attrib['quality']] = v.text

weboob/backends/bp/pages/accounthistory.py

@@ -50,7 +50,7 @@ class AccountHistory(BasePage):
             operation = Operation(len(operations))
             operation.date = mvt.xpath("./td/span")[0].text
             tmp = mvt.xpath("./td/span")[1]
-            operation.label = remove_extra_spaces(remove_html_tags(self.browser.parser.tostring(tmp)))
+            operation.label = remove_extra_spaces(remove_html_tags(self.parser.tostring(tmp)))
 
             r = re.compile(r'\d+')
             

weboob/backends/canaltp/browser.py

@@ -22,7 +22,7 @@ from datetime import datetime, date, time
 
 from weboob.tools.browser import BaseBrowser
 from weboob.tools.misc import to_unicode
-from weboob.tools.parsers.lxmlparser import SelectElementException
+from weboob.tools.browser import BrokenPageError
 
 
 __all__ = ['CanalTP']
@@ -52,7 +52,7 @@ class CanalTP(BaseBrowser):
         departure = ''
         for line in result.split('&'):
             if not '=' in line:
-                raise SelectElementException('Unable to parse result: %s' % line)
+                raise BrokenPageError('Unable to parse result: %s' % line)
             key, value = line.split('=', 1)
             if key == 'nomgare':
                 departure = value

weboob/backends/dailymotion/pages.py

@@ -24,7 +24,7 @@ import re
 from weboob.capabilities.video import VideoThumbnail
 from weboob.tools.misc import html2text
 from weboob.tools.browser import BasePage
-from weboob.tools.parsers.lxmlparser import select
+
 
 from .video import DailymotionVideo
 
@@ -34,7 +34,7 @@ __all__ = ['IndexPage', 'VideoPage']
 
 class IndexPage(BasePage):
     def iter_videos(self):
-        for div in select(self.document.getroot(), 'div.dmpi_video_item'):
+        for div in self.parser.select(self.document.getroot(), 'div.dmpi_video_item'):
             _id = 0
             for cls in div.attrib['class'].split():
                 if cls.startswith('id_'):
@@ -46,15 +46,15 @@ class IndexPage(BasePage):
                 continue
 
             video = DailymotionVideo(int(_id))
-            video.title = select(div, 'h3 a', 1).text
+            video.title = self.parser.select(div, 'h3 a', 1).text
-            video.author = select(div, 'div.dmpi_user_login', 1).find('a').text
+            video.author = self.parser.select(div, 'div.dmpi_user_login', 1).find('a').text
-            video.description = html2text(self.browser.parser.tostring(select(div, 'div.dmpi_video_description', 1))).strip()
+            video.description = html2text(self.parser.tostring(self.parser.select(div, 'div.dmpi_video_description', 1))).strip()
-            minutes, seconds = select(div, 'div.duration', 1).text.split(':')
+            minutes, seconds = self.parser.select(div, 'div.duration', 1).text.split(':')
             video.duration = datetime.timedelta(minutes=int(minutes), seconds=int(seconds))
-            url = select(div, 'img.dmco_image', 1).attrib['src']
+            url = self.parser.select(div, 'img.dmco_image', 1).attrib['src']
             video.thumbnail = VideoThumbnail(url)
 
-            rating_div = select(div, 'div.small_stars', 1)
+            rating_div = self.parser.select(div, 'div.small_stars', 1)
             video.rating_max = self.get_rate(rating_div)
             video.rating = self.get_rate(rating_div.find('div'))
             # XXX missing date
@@ -73,12 +73,12 @@ class VideoPage(BasePage):
         if video is None:
             video = DailymotionVideo(self.group_dict['id'])
 
-        div = select(self.document.getroot(), 'div#content', 1)
+        div = self.parser.select(self.document.getroot(), 'div#content', 1)
 
-        video.title = select(div, 'span.title', 1).text
+        video.title = self.parser.select(div, 'span.title', 1).text
-        video.author = select(div, 'a.name', 1).text
+        video.author = self.parser.select(div, 'a.name', 1).text
-        video.description = select(div, 'div#video_description', 1).text
+        video.description = self.parser.select(div, 'div#video_description', 1).text
-        for script in select(self.document.getroot(), 'div.dmco_html'):
+        for script in self.parser.select(self.document.getroot(), 'div.dmco_html'):
             if 'id' in script.attrib and script.attrib['id'].startswith('container_player_'):
                 text = script.find('script').text
                 mobj = re.search(r'(?i)addVariable\(\"video\"\s*,\s*\"([^\"]*)\"\)', text)

weboob/backends/dlfp/pages/board.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
-from weboob.tools.parsers.lxmlparser import select
+
 from weboob.tools.browser import BasePage
 
 class Message(object):
@@ -34,7 +34,7 @@ class BoardIndexPage(BasePage):
 
     def get_messages(self, last=None):
         msgs = []
-        for post in select(self.document.getroot(), 'post'):
+        for post in self.parser.select(self.document.getroot(), 'post'):
             m = Message(int(post.attrib['id']),
                         post.attrib['time'],
                         post.find('login').text,

weboob/backends/dlfp/pages/news.py

@@ -20,7 +20,7 @@
 
 from datetime import datetime
 
-from weboob.tools.parsers.lxmlparser import select, SelectElementException
+from weboob.tools.browser import BrokenPageError
 from weboob.tools.misc import local2utc
 from weboob.backends.dlfp.tools import url2id
 
@@ -54,23 +54,23 @@ class Comment(Content):
 
         self.id = div.attrib['id'].split('-')[1]
         self.url = '%s#%s' % (article.url, div.attrib['id'])
-        self.title = unicode(select(div.find('h2'), 'a.title', 1).text)
+        self.title = unicode(self.browser.parser.select(div.find('h2'), 'a.title', 1).text)
         try:
-            a = select(div.find('p'), 'a[rel=author]', 1)
+            a = self.browser.parser.select(div.find('p'), 'a[rel=author]', 1)
-        except SelectElementException:
+        except BrokenPageError:
             self.author = 'Anonyme'
             self.username = None
         else:
             self.author = unicode(a.text)
             self.username = unicode(a.attrib['href'].split('/')[2])
-        self.date = datetime.strptime(select(div.find('p'), 'time', 1).attrib['datetime'].split('+')[0],
+        self.date = datetime.strptime(self.browser.parser.select(div.find('p'), 'time', 1).attrib['datetime'].split('+')[0],
                                       '%Y-%m-%dT%H:%M:%S')
         self.date = local2utc(self.date)
 
         content = div.find('div')
         try:
-            signature = select(content, 'p.signature', 1)
+            signature = self.browser.parser.select(content, 'p.signature', 1)
-        except SelectElementException:
+        except BrokenPageError:
             # No signature.
             pass
         else:
@@ -78,11 +78,11 @@ class Comment(Content):
             self.signature = self.browser.parser.tostring(signature)
         self.body = self.browser.parser.tostring(content)
 
-        self.score = int(select(div.find('p'), 'span.score', 1).text)
+        self.score = int(self.browser.parser.select(div.find('p'), 'span.score', 1).text)
-        forms = select(div.find('footer'), 'form.button_to')
+        forms = self.browser.parser.select(div.find('footer'), 'form.button_to')
         if len(forms) > 0:
             self.relevance_url = forms[0].attrib['action'].rstrip('for').rstrip('against')
-            self.relevance_token = select(forms[0], 'input[name=authenticity_token]', 1).attrib['value']
+            self.relevance_token = self.browser.parser.select(forms[0], 'input[name=authenticity_token]', 1).attrib['value']
 
         subs = div.find('ul')
         if subs is not None:
@@ -113,26 +113,26 @@ class Article(Content):
         header = tree.find('header')
         self.title = u' — '.join([a.text for a in header.find('h1').findall('a')])
         try:
-            a = select(header, 'a[rel=author]', 1)
+            a = self.browser.parser.select(header, 'a[rel=author]', 1)
-        except SelectElementException:
+        except BrokenPageError:
             self.author = 'Anonyme'
             self.username = None
         else:
             self.author = unicode(a.text)
             self.username = unicode(a.attrib['href'].split('/')[2])
-        self.body = self.browser.parser.tostring(select(tree, 'div.content', 1))
+        self.body = self.browser.parser.tostring(self.browser.parser.select(tree, 'div.content', 1))
         try:
-            self.date = datetime.strptime(select(header, 'time', 1).attrib['datetime'].split('+')[0],
+            self.date = datetime.strptime(self.browser.parser.select(header, 'time', 1).attrib['datetime'].split('+')[0],
                                           '%Y-%m-%dT%H:%M:%S')
             self.date = local2utc(self.date)
-        except SelectElementException:
+        except BrokenPageError:
             pass
-        forms = select(tree.find('footer'), 'form.button_to')
+        forms = self.browser.parser.select(tree.find('footer'), 'form.button_to')
         if len(forms) > 0:
             self.relevance_url = forms[0].attrib['action'].rstrip('for').rstrip('against')
-            self.relevance_token = select(forms[0], 'input[name=authenticity_token]', 1).attrib['value']
+            self.relevance_token = self.browser.parser.select(forms[0], 'input[name=authenticity_token]', 1).attrib['value']
 
-        self.score = int(select(tree, 'div.figures figure.score', 1).text)
+        self.score = int(self.browser.parser.select(tree, 'div.figures figure.score', 1).text)
 
     def append_comment(self, comment):
         self.comments.append(comment)
@@ -146,7 +146,7 @@ class Article(Content):
 class CommentPage(DLFPPage):
     def get_comment(self):
         article = Article(self.browser, self.url, None)
-        return Comment(article, select(self.document.getroot(), 'li.comment', 1), 0)
+        return Comment(article, self.parser.select(self.document.getroot(), 'li.comment', 1), 0)
 
 class ContentPage(DLFPPage):
     def on_loaded(self):
@@ -158,8 +158,8 @@ class ContentPage(DLFPPage):
     def get_comment(self, id):
         article = Article(self.browser, self.url, None)
         try:
-            li = select(self.document.getroot(), 'li#comment-%s' % id, 1)
+            li = self.parser.select(self.document.getroot(), 'li#comment-%s' % id, 1)
-        except SelectElementException:
+        except BrokenPageError:
             return None
         else:
             return Comment(article, li, 0)
@@ -168,11 +168,11 @@ class ContentPage(DLFPPage):
         if not self.article:
             self.article = Article(self.browser,
                                    self.url,
-                                   select(self.document.getroot(), 'div#contents article', 1))
+                                   self.parser.select(self.document.getroot(), 'div#contents article', 1))
 
             try:
-                threads = select(self.document.getroot(), 'ul.threads', 1)
+                threads = self.parser.select(self.document.getroot(), 'ul.threads', 1)
-            except SelectElementException:
+            except BrokenPageError:
                 pass # no comments
             else:
                 for comment in threads.findall('li'):
@@ -181,10 +181,10 @@ class ContentPage(DLFPPage):
         return self.article
 
     def get_post_comment_url(self):
-        return select(self.document.getroot(), 'p#send-comment', 1).find('a').attrib['href']
+        return self.parser.select(self.document.getroot(), 'p#send-comment', 1).find('a').attrib['href']
 
     def get_tag_url(self):
-        return select(self.document.getroot(), 'div.tag_in_place', 1).find('a').attrib['href']
+        return self.parser.select(self.document.getroot(), 'div.tag_in_place', 1).find('a').attrib['href']
 
 class NewCommentPage(DLFPPage):
     pass
@@ -201,8 +201,8 @@ class NewTagPage(DLFPPage):
 class NodePage(DLFPPage):
     def get_errors(self):
         try:
-            div = select(self.document.getroot(), 'div.errors', 1)
+            div = self.parser.select(self.document.getroot(), 'div.errors', 1)
-        except SelectElementException:
+        except BrokenPageError:
             return []
 
         l = []

weboob/backends/dlfp/pages/wiki.py

@@ -17,15 +17,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
-from weboob.tools.parsers.lxmlparser import select, SelectElementException
+from weboob.tools.browser import BrokenPageError
 
 from .index import DLFPPage
 
 class WikiEditPage(DLFPPage):
     def get_body(self):
         try:
-            return select(self.document.getroot(), 'textarea#wiki_page_wiki_body', 1).text
+            return self.parser.select(self.document.getroot(), 'textarea#wiki_page_wiki_body', 1).text
-        except SelectElementException:
+        except BrokenPageError:
             return ''
 
     def _is_wiki_form(self, form):
@@ -52,5 +52,5 @@ class WikiEditPage(DLFPPage):
         self.browser.submit()
 
     def get_preview_html(self):
-        body = select(self.document.getroot(), 'article.wikipage div.content', 1)
+        body = self.parser.select(self.document.getroot(), 'article.wikipage div.content', 1)
-        return self.browser.parser.tostring(body)
+        return self.parser.tostring(body)

weboob/backends/ecrans/pages/article.py

@@ -29,9 +29,9 @@ class ArticlePage(GenericNewsPage):
 
     def get_body(self):
         element_body = self.get_element_body()
-        remove_from_selector_list(element_body, ["p.auteur", "h4" ])
+        remove_from_selector_list(self.parser, element_body, ["p.auteur", "h4" ])
-        try_remove_from_selector_list(element_body, ["p.tag", "div.alire", self.element_title_selector, "h4"])
+        try_remove_from_selector_list(self.parser, element_body, ["p.tag", "div.alire", self.element_title_selector, "h4"])
-        try_drop_tree(element_body, "script")
+        try_drop_tree(self.parser, element_body, "script")
 
-        return self.browser.parser.tostring(element_body)
+        return self.parser.tostring(element_body)
 

weboob/backends/fourchan/pages/board.py

@@ -87,7 +87,7 @@ class BoardPage(BasePage):
             if div.tag == 'input' and div.attrib.get('type', 'checkbox') and div.attrib.get('value', 'delete'):
                 article.id = int(div.attrib.get('name', '0'))
             if div.tag == 'blockquote':
-                article.text = self.browser.parser.tostring(div)
+                article.text = self.parser.tostring(div)
             if div.tag == 'table':
                 tags = div.cssselect('td.reply')
                 if tags:

weboob/backends/gazelle/pages/torrents.py

@@ -168,7 +168,7 @@ class TorrentsPage(BasePage):
                 title = title_t[0].find('strong').text.strip()
             body_t = box.cssselect('div.body')
             if body_t:
-                body = html2text(self.browser.parser.tostring(body_t[0])).strip()
+                body = html2text(self.parser.tostring(body_t[0])).strip()
 
             if title and body:
                 if torrent.description is NotLoaded:

weboob/backends/ina/pages/search.py

@@ -22,7 +22,7 @@ import datetime
 import re
 
 from weboob.tools.browser import BasePage
-from weboob.tools.parsers.lxmlparser import select, SelectElementException
+from weboob.tools.browser import BrokenPageError
 
 from ..video import InaVideo
 
@@ -35,8 +35,8 @@ class SearchPage(BasePage):
 
     def iter_videos(self):
         try:
-            ul = select(self.document.getroot(), 'div.container-videos ul', 1)
+            ul = self.parser.select(self.document.getroot(), 'div.container-videos ul', 1)
-        except SelectElementException:
+        except BrokenPageError:
             # It means there are no results.
             return
         for li in ul.findall('li'):
@@ -44,18 +44,18 @@ class SearchPage(BasePage):
 
             thumbnail = 'http://boutique.ina.fr%s' % li.find('a').find('img').attrib['src']
 
-            title = select(li, 'p.titre', 1).text
+            title = self.parser.select(li, 'p.titre', 1).text
 
-            date = select(li, 'p.date', 1).text
+            date = self.parser.select(li, 'p.date', 1).text
             day, month, year = [int(s) for s in date.split('/')]
             date = datetime.datetime(year, month, day)
 
-            duration = select(li, 'p.duree', 1).text
+            duration = self.parser.select(li, 'p.duree', 1).text
             m = re.match(r'((\d+)h)?((\d+)min)?(\d+)s', duration)
             if m:
                 duration = datetime.timedelta(hours=int(m.group(2) or 0), minutes=int(m.group(4) or 0), seconds=int(m.group(5)))
             else:
-                raise SelectElementException('Unable to match duration (%r)' % duration)
+                raise BrokenPageError('Unable to match duration (%r)' % duration)
 
             yield InaVideo(id,
                            title=title,

weboob/backends/ina/pages/video.py

@@ -27,7 +27,7 @@ except ImportError:
     from cgi import parse_qs
 
 from weboob.tools.browser import BasePage
-from weboob.tools.parsers.lxmlparser import SelectElementException
+from weboob.tools.browser import BrokenPageError
 
 from ..video import InaVideo
 
@@ -75,9 +75,9 @@ class VideoPage(BasePage):
                                               seconds=int(m.group(6)))
                 return date, duration
             else:
-                raise SelectElementException('Unable to parse date and duration')
+                raise BrokenPageError('Unable to parse date and duration')
         else:
-            raise SelectElementException('Unable to find date and duration element')
+            raise BrokenPageError('Unable to find date and duration element')
 
     def get_title(self):
         el = self.document.getroot().cssselect('div.bloc-produit-haut h1')[0]

weboob/backends/inrocks/pages/article.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
-from weboob.tools.parsers.lxmlparser import select, SelectElementException
+from weboob.tools.browser import BrokenPageError
 from weboob.tools.genericArticle import GenericNewsPage, try_remove, \
                                         try_remove_from_selector_list, \
                                         drop_comments, NoneMainDiv
@@ -35,26 +35,28 @@ class ArticlePage(GenericNewsPage):
         try :
             element_body = self.get_element_body()
         except NoneMainDiv:
-            return None 
+            return None
         else:
-            div_header_element = select(element_body, "div.header", 1)
+            div_header_element = self.parser.select(element_body, "div.header", 1)
-            element_detail = select(element_body, "div.details", 1)
+            element_detail = self.parser.select(element_body, "div.details", 1)
-            div_content_element = select(element_body, "div.content", 1)
+            div_content_element = self.parser.select(element_body, "div.content", 1)
 
             drop_comments(element_body)
-            try_remove(element_body, "div.sidebar")
+            try_remove(self.parser, element_body, "div.sidebar")
-            try_remove(element_detail, "div.footer")
+            try_remove(self.parser, element_detail, "div.footer")
-            try_remove_from_selector_list(div_header_element, 
+            try_remove_from_selector_list(self.parser,
-                                          ["h1", "div.picture", "div.date", 
+                                          div_header_element,
-                                           "div.news-single-img", 
+                                          ["h1", "div.picture", "div.date",
+                                           "div.news-single-img",
                                            "div.metas_img", "strong"])
-            try_remove_from_selector_list(div_content_element, 
+            try_remove_from_selector_list(self.parser,
+                                          div_content_element,
                                           ["div.tw_button", "div.wpfblike"])
 
             try :
-                description_element = select(div_header_element, 
+                description_element = self.parser.select(div_header_element,
                                              "div.description", 1)
-            except SelectElementException:
+            except BrokenPageError:
                 pass
             else:
                 text_content = description_element.text_content()
@@ -75,6 +77,4 @@ class ArticlePage(GenericNewsPage):
 
             div_content_element.drop_tag()
 
-            return self.browser.parser.tostring(element_body)
+            return self.parser.tostring(element_body)
-
-

weboob/backends/inrocks/pages/inrockstv.py

@@ -30,4 +30,4 @@ class InrocksTvPage(GenericNewsPage):
 
     def get_body(self):
         element_body = self.get_element_body()
-        return self.browser.parser.tostring(element_body)
+        return self.parser.tostring(element_body)

weboob/backends/lefigaro/pages/article.py

@@ -30,13 +30,13 @@ class ArticlePage(GenericNewsPage):
 
     def get_body(self):
         element_body = self.get_element_body()
-        remove_from_selector_list(element_body, [self.element_title_selector])
+        remove_from_selector_list(self.parser, element_body, [self.element_title_selector])
         drop_comments(element_body)
-        try_drop_tree(element_body, "script")
+        try_drop_tree(self.parser, element_body, "script")
 
-        try_remove_from_selector_list(element_body, ["div.infos", "div.photo", "div.art_bandeau_bottom", "div.view", "span.auteur_long", "#toolsbar", 'link'])
+        try_remove_from_selector_list(self.parser, element_body, ["div.infos", "div.photo", "div.art_bandeau_bottom", "div.view", "span.auteur_long", "#toolsbar", 'link'])
 
         element_body.find_class("texte")[0].drop_tag()
         element_body.tag = "div"
-        return self.browser.parser.tostring(element_body)
+        return self.parser.tostring(element_body)
 

weboob/backends/lefigaro/pages/flashactu.py

@@ -31,5 +31,5 @@ class FlashActuPage(GenericNewsPage):
     def get_body(self):
         element_body = self.get_element_body()
         element_body.tag = "div"
-        return self.browser.parser.tostring(element_body)
+        return self.parser.tostring(element_body)
 

weboob/backends/lemouv/pages.py

@@ -19,7 +19,7 @@
 
 
 from weboob.tools.browser import BasePage
-from weboob.tools.parsers.lxmlparser import select
+
 
 
 __all__ = ['XMLinfos']
@@ -28,7 +28,7 @@ __all__ = ['XMLinfos']
 class XMLinfos(BasePage):
     def get_current(self):
         try:
-            for channel in select(self.document.getroot(), 'channel'):
+            for channel in self.parser.select(self.document.getroot(), 'channel'):
                 title = channel.find('item/song_title').text
                 artist = channel.find('item/artist_name').text
         except AttributeError:

weboob/backends/minutes20/pages/article.py

@@ -35,11 +35,11 @@ class ArticlePage(SimplePage):
         except NoneMainDiv:
             return None
         else:
-            try_remove(element_body, "div.mna-tools")
+            try_remove(self.parser, element_body, "div.mna-tools")
-            try_remove(element_body, "div.mna-comment-call")
+            try_remove(self.parser, element_body, "div.mna-comment-call")
             try :
                 element_body.remove(self.get_element_author())
             except NoAuthorElement:
                 pass
-            return self.browser.parser.tostring(element_body)
+            return self.parser.tostring(element_body)
 

weboob/backends/ouifm/pages.py

@@ -19,7 +19,7 @@
 
 
 from weboob.tools.browser import BasePage
-from weboob.tools.parsers.lxmlparser import select
+
 
 
 __all__ = ['PlayerPage']
@@ -27,6 +27,6 @@ __all__ = ['PlayerPage']
 
 class PlayerPage(BasePage):
     def get_current(self):
-        title = select(self.document.getroot(), 'span.titre_en_cours', 1).text
+        title = self.parser.select(self.document.getroot(), 'span.titre_en_cours', 1).text
-        artist = select(self.document.getroot(), 'span.artiste_en_cours', 1).text
+        artist = self.parser.select(self.document.getroot(), 'span.artiste_en_cours', 1).text
         return unicode(artist).strip(), unicode(title).strip()

weboob/backends/redmine/pages/wiki.py

@@ -19,11 +19,11 @@
 
 
 from weboob.tools.browser import BasePage
-from weboob.tools.parsers.lxmlparser import select
+
 
 class WikiEditPage(BasePage):
     def get_source(self):
-        return select(self.document.getroot(), 'textarea#content_text', 1).text
+        return self.parser.select(self.document.getroot(), 'textarea#content_text', 1).text
 
     def set_source(self, data, message):
         self.browser.select_form(nr=1)
@@ -33,7 +33,7 @@ class WikiEditPage(BasePage):
         self.browser.submit()
 
     def get_authenticity_token(self):
-        wiki_form = select(self.document.getroot(), 'form#wiki_form', 1)
+        wiki_form = self.parser.select(self.document.getroot(), 'form#wiki_form', 1)
         return wiki_form.xpath('div/input')[0].get('value')