diff --git a/weboob/backends/aum/adopte.py b/weboob/backends/aum/adopte.py index e8e398ed..d8865ae1 100644 --- a/weboob/backends/aum/adopte.py +++ b/weboob/backends/aum/adopte.py @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import time from logging import warning -from weboob.tools.browser import Browser +from weboob.tools.browser import BaseBrowser from weboob.tools.parser import Html5libParser from weboob.backends.aum.exceptions import AdopteWait @@ -36,7 +36,7 @@ from weboob.backends.aum.pages.login import LoginPage, RedirectPage, BanPage, Er from weboob.backends.aum.pages.edit import EditPhotoPage, EditPhotoCbPage, EditAnnouncePage, EditDescriptionPage, EditSexPage, EditPersonalityPage from weboob.backends.aum.pages.wait import WaitPage -class AdopteUnMec(Browser): +class AdopteUnMec(BaseBrowser): DOMAIN = 'www.adopteunmec.com' PROTOCOL = 'http' ENCODING = 'iso-8859-1' @@ -71,7 +71,7 @@ class AdopteUnMec(Browser): def __init__(self, *args, **kwargs): kwargs['parser'] = Html5libParser(api='dom') - Browser.__init__(self, *args, **kwargs) + BaseBrowser.__init__(self, *args, **kwargs) self.my_id = 0 def login(self): diff --git a/weboob/backends/bnporc/browser.py b/weboob/backends/bnporc/browser.py index 7cdac148..d13020db 100644 --- a/weboob/backends/bnporc/browser.py +++ b/weboob/backends/bnporc/browser.py @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from cStringIO import StringIO -from weboob.tools.browser import Browser, BrowserIncorrectPassword +from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword from weboob.tools.parser import ElementTidyParser from weboob.backends.bnporc import pages @@ -33,7 +33,7 @@ class BNParser(ElementTidyParser): return ElementTidyParser.parse(self, data, encoding) # Browser -class BNPorc(Browser): +class BNPorc(BaseBrowser): DOMAIN = 'www.secure.bnpparibas.net' PROTOCOL = 'https' ENCODING = None # refer to the HTML encoding @@ -51,7 +51,7 @@ class BNPorc(Browser): def __init__(self, *args, **kwargs): kwargs['parser'] = BNParser() kwargs['history'] = None # need history - Browser.__init__(self, *args, **kwargs) + BaseBrowser.__init__(self, *args, **kwargs) def home(self): self.location('https://www.secure.bnpparibas.net/banque/portail/particulier/HomeConnexion?type=homeconnex') diff --git a/weboob/backends/canaltp/browser.py b/weboob/backends/canaltp/browser.py index c01d38ac..e664f31b 100644 --- a/weboob/backends/canaltp/browser.py +++ b/weboob/backends/canaltp/browser.py @@ -19,16 +19,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ from datetime import datetime, date, time -from weboob.tools.browser import Browser +from weboob.tools.browser import BaseBrowser from weboob.tools.misc import toUnicode -class CanalTP(Browser): +class CanalTP(BaseBrowser): DOMAIN = 'widget.canaltp.fr' PROTOCOL = 'http' PAGES = {} def __init__(self): - Browser.__init__(self, '') + BaseBrowser.__init__(self, '') def iter_station_search(self, pattern): result = self.openurl(u"http://widget.canaltp.fr/Prochains_departs_15122009/dev/gare.php?txtrech=%s" % unicode(pattern)).read() diff --git a/weboob/backends/cragr/browser.py b/weboob/backends/cragr/browser.py index 4f9929ed..56bc6752 100644 --- a/weboob/backends/cragr/browser.py +++ b/weboob/backends/cragr/browser.py @@ -18,11 +18,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from weboob.tools.browser import Browser, BrowserIncorrectPassword +from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword from weboob.backends.cragr import pages # Browser -class Cragr(Browser): +class Cragr(BaseBrowser): PROTOCOL = 'https' ENCODING = 'utf-8' USER_AGENT = 'Wget/1.11.4' @@ -35,7 +35,7 @@ class Cragr(Browser): 'https://%s/.*\.c.*' % website: pages.AccountsList, 'https://%s/login/process' % website: pages.AccountsList, } - Browser.__init__(self, *args, **kwargs) + BaseBrowser.__init__(self, *args, **kwargs) def viewing_html(self): """ diff --git a/weboob/backends/dlfp/browser.py b/weboob/backends/dlfp/browser.py index 923913a4..1679c6b0 100644 --- a/weboob/backends/dlfp/browser.py +++ b/weboob/backends/dlfp/browser.py @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import urllib from cStringIO import StringIO -from weboob.tools.browser import Browser +from weboob.tools.browser import BaseBrowser from .pages.index import IndexPage, LoginPage from .pages.news import ContentPage from .tools import id2url, id2threadid, id2contenttype @@ -37,7 +37,7 @@ class DLFParser(StandardParser): return StandardParser.parse(self, data, encoding) # Browser -class DLFP(Browser): +class DLFP(BaseBrowser): DOMAIN = 'linuxfr.org' PROTOCOL = 'https' PAGES = {'https://linuxfr.org/': IndexPage, @@ -49,7 +49,7 @@ class DLFP(Browser): def __init__(self, *args, **kwargs): kwargs['parser'] = DLFParser() - Browser.__init__(self, *args, **kwargs) + BaseBrowser.__init__(self, *args, **kwargs) def home(self): return self.location('https://linuxfr.org') diff --git a/weboob/backends/transilien/browser.py b/weboob/backends/transilien/browser.py index 095bd233..844ca835 100644 --- a/weboob/backends/transilien/browser.py +++ b/weboob/backends/transilien/browser.py @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from datetime import datetime, date, time import HTMLParser -from weboob.tools.browser import Browser +from weboob.tools.browser import BaseBrowser from weboob.tools.misc import toUnicode from .pages.route import RoutePage @@ -114,7 +114,7 @@ class Parser(HTMLParser.HTMLParser): __curseur_horaire += 1 return __list_route -class Transilien(Browser): +class Transilien(BaseBrowser): DOMAIN = 'www.transilien.com' PROTOCOL = 'http' PAGES = {'http://www\.transilien\.com/web/ITProchainsTrainsAvecDest\.do\?.*': RoutePage, @@ -122,7 +122,7 @@ class Transilien(Browser): } def __init__(self): - Browser.__init__(self, '', parser=Parser()) + BaseBrowser.__init__(self, '', parser=Parser()) def iter_station_search(self, pattern): pass diff --git a/weboob/backends/youjizz/browser.py b/weboob/backends/youjizz/browser.py index 71bf2dd0..ace6171f 100644 --- a/weboob/backends/youjizz/browser.py +++ b/weboob/backends/youjizz/browser.py @@ -21,10 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from logging import error import re -from weboob.tools.browser import Browser +from weboob.tools.browser import BaseBrowser from weboob.tools.parser import LxmlHtmlParser -class YoujizzBrowser(Browser): +class YoujizzBrowser(BaseBrowser): video_file_regex = re.compile(r'"(http://media[^ ,]+\.flv)"') def __init__(self, *args, **kwargs): diff --git a/weboob/backends/youtube/browser.py b/weboob/backends/youtube/browser.py index d701118d..68bc36fb 100644 --- a/weboob/backends/youtube/browser.py +++ b/weboob/backends/youtube/browser.py @@ -20,18 +20,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import re -from weboob.tools.browser import Browser +from weboob.tools.browser import BaseBrowser from weboob.tools.parser import LxmlHtmlParser from .pages import VideoPage -class YoutubeBrowser(Browser): + video_signature_regex = re.compile(r'&t=([^ ,&]*)') + +class YoutubeBrowser(BaseBrowser): video_signature_regex = re.compile(r'&t=([^ ,&]*)') def __init__(self, *args, **kwargs): kwargs['parser'] = LxmlHtmlParser() - self.PAGES = {r'http://.*\.youtube\.com/watch\?v=(.+)': VideoPage} - Browser.__init__(self, *args, **kwargs) + self.PAGES = {r'.*youtube\.com/watch\?v=(.+)': VideoPage} + BaseBrowser.__init__(self, *args, **kwargs) def get_video_title(self, page_url): self.location(page_url) diff --git a/weboob/tools/browser.py b/weboob/tools/browser.py index 154423ad..d017b765 100644 --- a/weboob/tools/browser.py +++ b/weboob/tools/browser.py @@ -75,7 +75,7 @@ class BasePage(object): """ pass -class Browser(mechanize.Browser): +class BaseBrowser(mechanize.Browser): """ Base browser class to navigate on a website. """