From 0088013ae1319cfcb28a7982cc23eb9bd72f8edc Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 23 Sep 2014 10:53:38 +0200 Subject: [PATCH] Rename BaseBrowser to Browser --- docs/source/guides/module.rst | 2 +- modules/750g/browser.py | 6 +++--- modules/adecco/browser.py | 4 ++-- modules/allocine/browser.py | 4 ++-- modules/allrecipes/browser.py | 6 +++--- modules/ameli/browser.py | 4 ++-- modules/amelipro/browser.py | 4 ++-- modules/americanexpress/browser.py | 4 ++-- modules/apec/browser.py | 4 ++-- modules/apivie/browser.py | 4 ++-- modules/arretsurimages/browser.py | 4 ++-- modules/arte/browser.py | 6 +++--- modules/attilasub/browser.py | 6 +++--- modules/aum/browser.py | 10 +++++----- modules/axabanque/browser.py | 4 ++-- modules/banquepopulaire/browser.py | 6 +++--- modules/barclays/browser.py | 6 +++--- modules/bnporc/browser.py | 6 +++--- modules/bnporc/enterprise/browser.py | 4 ++-- modules/boursorama/browser.py | 6 +++--- modules/bouygues/browser.py | 4 ++-- modules/bp/browser.py | 6 +++--- modules/bred/browser.py | 6 +++--- modules/btdigg/browser.py | 6 +++--- modules/btmon/browser.py | 6 +++--- modules/caissedepargne/browser.py | 8 ++++---- modules/canalplus/browser.py | 6 +++--- modules/canaltp/browser.py | 6 +++--- modules/cappedtv/browser.py | 4 ++-- modules/champslibres/browser.py | 4 ++-- modules/chronopost/browser.py | 4 ++-- modules/cic/browser.py | 6 +++--- modules/citelis/browser.py | 6 +++--- modules/cmb/module.py | 4 ++-- modules/cmso/browser.py | 4 ++-- modules/colisprive/browser.py | 4 ++-- modules/colissimo/browser.py | 6 +++--- modules/cragr/mobile/browser.py | 12 ++++++------ modules/cragr/web/browser.py | 6 +++--- modules/creditcooperatif/perso/browser.py | 4 ++-- modules/creditcooperatif/pro/browser.py | 6 +++--- modules/creditdunord/browser.py | 6 +++--- modules/cuisineaz/browser.py | 6 +++--- modules/dailymotion/browser.py | 4 ++-- modules/delubac/browser.py | 4 ++-- modules/dlfp/browser.py | 4 ++-- modules/edf/browser.py | 4 ++-- modules/ehentai/browser.py | 6 +++--- modules/europarl/browser.py | 4 ++-- modules/fortuneo/browser.py | 6 +++--- modules/fourchan/browser.py | 4 ++-- modules/ganassurances/browser.py | 6 +++--- modules/gazelle/browser.py | 6 +++--- modules/gdcvault/browser.py | 4 ++-- modules/gdfsuez/browser.py | 6 +++--- modules/geolocip/module.py | 4 ++-- modules/github/browser.py | 6 +++--- modules/googletranslate/browser.py | 8 ++++---- modules/grooveshark/browser.py | 4 ++-- modules/guerrillamail/browser.py | 6 +++--- modules/hds/browser.py | 4 ++-- modules/hellobank/browser.py | 6 +++--- modules/imdb/browser.py | 6 +++--- modules/ina/browser.py | 4 ++-- modules/inrocks/browser.py | 4 ++-- modules/izneo/module.py | 4 ++-- modules/jacquieetmichel/browser.py | 4 ++-- modules/jcvelaux/browser.py | 6 +++--- modules/jvmalin/browser.py | 6 +++--- modules/kickass/browser.py | 6 +++--- modules/lacentrale/browser.py | 4 ++-- modules/lcl/browser.py | 10 +++++----- modules/lcl/enterprise/browser.py | 8 ++++---- modules/leclercmobile/browser.py | 6 +++--- modules/lefigaro/browser.py | 4 ++-- modules/liberation/browser.py | 4 ++-- modules/lolix/browser.py | 4 ++-- modules/lutim/browser.py | 6 +++--- modules/mailinator/browser.py | 6 +++--- modules/marmiton/browser.py | 6 +++--- modules/mediawiki/browser.py | 6 +++--- modules/meteofrance/browser.py | 6 +++--- modules/minutes20/browser.py | 4 ++-- modules/monster/browser.py | 4 ++-- modules/nectarine/browser.py | 6 +++--- modules/nettokom/browser.py | 6 +++--- modules/nihonnooto/browser.py | 6 +++--- modules/nolifetv/browser.py | 6 +++--- modules/okc/browser.py | 4 ++-- modules/opacwebaloes/browser.py | 8 ++++---- modules/opensubtitles/browser.py | 6 +++--- modules/orange/browser.py | 4 ++-- modules/ovs/browser.py | 6 +++--- modules/pap/browser.py | 4 ++-- modules/pariskiwi/browser.py | 6 +++--- modules/parolesmania/browser.py | 6 +++--- modules/parolesmusique/browser.py | 6 +++--- modules/parolesnet/browser.py | 6 +++--- modules/paypal/browser.py | 4 ++-- modules/phpbb/browser.py | 8 ++++---- modules/piratebay/browser.py | 6 +++--- modules/pixtoilelibre/browser.py | 4 ++-- modules/podnapisi/browser.py | 6 +++--- modules/popolemploi/browser.py | 4 ++-- modules/presseurop/browser.py | 4 ++-- modules/prixcarburants/browser.py | 4 ++-- modules/radiofrance/browser.py | 4 ++-- modules/redmine/browser.py | 6 +++--- modules/seeklyrics/browser.py | 6 +++--- modules/seloger/browser.py | 6 +++--- modules/sfr/browser.py | 4 ++-- modules/societegenerale/browser.py | 6 +++--- modules/societegenerale/sgpe/browser.py | 6 +++--- modules/sueurdemetal/browser.py | 4 ++-- modules/supertoinette/browser.py | 6 +++--- modules/taz/browser.py | 4 ++-- modules/trictractv/browser.py | 4 ++-- modules/tvsubtitles/browser.py | 6 +++--- modules/unsee/browser.py | 4 ++-- modules/ups/browser.py | 4 ++-- modules/voyagessncf/browser.py | 6 +++--- modules/weather/browser.py | 6 +++--- modules/wordreference/browser.py | 8 ++++---- modules/youporn/browser.py | 4 ++-- modules/youtube/browser.py | 4 ++-- weboob/core/repositories.py | 4 ++-- weboob/tools/browser/__init__.py | 4 ++-- weboob/tools/browser/browser.py | 4 ++-- weboob/tools/browser2/__init__.py | 4 ++-- weboob/tools/browser2/browser.py | 8 ++++---- weboob/tools/browser2/page.py | 4 ++-- .../tools/capabilities/gallery/genericcomicreader.py | 6 +++--- 132 files changed, 348 insertions(+), 348 deletions(-) diff --git a/docs/source/guides/module.rst b/docs/source/guides/module.rst index 7db1cd7ac6..d6f13622cd 100644 --- a/docs/source/guides/module.rst +++ b/docs/source/guides/module.rst @@ -65,7 +65,7 @@ In a module directory, there are commonly these files: * **__init__.py** - needed in every python modules, it exports your :class:`Module ` class. * **module.py** - defines the main class of your module, which derives :class:`Module `. -* **browser.py** - your browser, derived from :class:`BaseBrowser `, is called by your module to interact with the supported website. +* **browser.py** - your browser, derived from :class:`Browser `, is called by your module to interact with the supported website. * **pages.py** - all website's pages handled by the browser are defined here * **test.py** - functional tests * **favicon.png** - a 64x64 transparent PNG icon diff --git a/modules/750g/browser.py b/modules/750g/browser.py index bbed397b16..eeaff1166f 100644 --- a/modules/750g/browser.py +++ b/modules/750g/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import RecipePage, ResultsPage @@ -26,11 +26,11 @@ __all__ = ['SevenFiftyGramsBrowser'] -class SevenFiftyGramsBrowser(BaseBrowser): +class SevenFiftyGramsBrowser(Browser): DOMAIN = 'www.750g.com' PROTOCOL = 'http' ENCODING = 'windows-1252' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.750g.com/recettes_.*.htm': ResultsPage, 'http://www.750g.com/fiche_de_cuisine_complete.htm\?recettes_id=[0-9]*': RecipePage, diff --git a/modules/adecco/browser.py b/modules/adecco/browser.py index bfb179645e..40d19fd39d 100644 --- a/modules/adecco/browser.py +++ b/modules/adecco/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.tools.browser.decorators import id2url -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .job import AdeccoJobAdvert from .pages import SearchPage, AdvertPage import urllib @@ -26,7 +26,7 @@ __all__ = ['AdeccoBrowser'] -class AdeccoBrowser(BaseBrowser): +class AdeccoBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.adecco.fr' ENCODING = None diff --git a/modules/allocine/browser.py b/modules/allocine/browser.py index 31e5e4f34a..de40b7bad0 100644 --- a/modules/allocine/browser.py +++ b/modules/allocine/browser.py @@ -20,7 +20,7 @@ from weboob.capabilities.base import NotAvailable, NotLoaded from weboob.capabilities.cinema import Movie, Person -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.json import json import base64 import hashlib @@ -32,7 +32,7 @@ __all__ = ['AllocineBrowser'] -class AllocineBrowser(BaseBrowser): +class AllocineBrowser(Browser): DOMAIN = 'api.allocine.fr' PROTOCOL = 'http' ENCODING = 'utf-8' diff --git a/modules/allrecipes/browser.py b/modules/allrecipes/browser.py index eccc2306cf..e4141c3689 100644 --- a/modules/allrecipes/browser.py +++ b/modules/allrecipes/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import RecipePage, ResultsPage, FourOFourPage @@ -26,11 +26,11 @@ __all__ = ['AllrecipesBrowser'] -class AllrecipesBrowser(BaseBrowser): +class AllrecipesBrowser(Browser): DOMAIN = 'allrecipes.com' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://allrecipes.com/search/default.aspx\?qt=k&wt=.*&rt=r&origin=.*': ResultsPage, 'http://allrecipes.com/Recipe/.*/Detail.aspx': RecipePage, diff --git a/modules/ameli/browser.py b/modules/ameli/browser.py index 8071804808..a8db710123 100644 --- a/modules/ameli/browser.py +++ b/modules/ameli/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.capabilities.bill import Detail from decimal import Decimal from .pages import LoginPage, HomePage, AccountPage, LastPaymentsPage, PaymentDetailsPage, BillsPage @@ -25,7 +25,7 @@ __all__ = ['AmeliBrowser'] -class AmeliBrowser(BaseBrowser): +class AmeliBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'assure.ameli.fr' ENCODING = None diff --git a/modules/amelipro/browser.py b/modules/amelipro/browser.py index 7543e977aa..028777b2f7 100644 --- a/modules/amelipro/browser.py +++ b/modules/amelipro/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . import urllib -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.capabilities.bill import Detail from decimal import Decimal from .pages import LoginPage, HomePage, AccountPage, HistoryPage, BillsPage @@ -26,7 +26,7 @@ __all__ = ['AmeliProBrowser'] -class AmeliProBrowser(BaseBrowser): +class AmeliProBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'espacepro.ameli.fr' ENCODING = None diff --git a/modules/americanexpress/browser.py b/modules/americanexpress/browser.py index 6d7120a81e..aacf1994f9 100644 --- a/modules/americanexpress/browser.py +++ b/modules/americanexpress/browser.py @@ -20,7 +20,7 @@ from urlparse import urlsplit, parse_qsl -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountsPage, TransactionsPage @@ -28,7 +28,7 @@ __all__ = ['AmericanExpressBrowser'] -class AmericanExpressBrowser(BaseBrowser): +class AmericanExpressBrowser(Browser): DOMAIN = 'global.americanexpress.com' PROTOCOL = 'https' ENCODING = 'ISO-8859-1' diff --git a/modules/apec/browser.py b/modules/apec/browser.py index 0425b0788f..0cc8bd736e 100644 --- a/modules/apec/browser.py +++ b/modules/apec/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.tools.browser.decorators import id2url -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser import urllib from .pages import SearchPage, AdvertPage from .job import ApecJobAdvert @@ -27,7 +27,7 @@ __all__ = ['ApecBrowser'] -class ApecBrowser(BaseBrowser): +class ApecBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.apec.fr' ENCODING = 'ISO-8859-1' diff --git a/modules/apivie/browser.py b/modules/apivie/browser.py index 1ba3381bdf..0b6e00b5da 100644 --- a/modules/apivie/browser.py +++ b/modules/apivie/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountsPage, OperationsPage @@ -26,7 +26,7 @@ __all__ = ['ApivieBrowser'] -class ApivieBrowser(BaseBrowser): +class ApivieBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'www.apivie.fr' ENCODING = None diff --git a/modules/arretsurimages/browser.py b/modules/arretsurimages/browser.py index b243310092..3cf6aa7fdc 100644 --- a/modules/arretsurimages/browser.py +++ b/modules/arretsurimages/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.tools.browser.decorators import id2url from .pages import VideoPage, IndexPage, LoginPage, LoginRedirectPage @@ -28,7 +28,7 @@ __all__ = ['ArretSurImagesBrowser'] -class ArretSurImagesBrowser(BaseBrowser): +class ArretSurImagesBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.arretsurimages.net' ENCODING = None diff --git a/modules/arte/browser.py b/modules/arte/browser.py index 56e256a4dd..dba15b8acc 100644 --- a/modules/arte/browser.py +++ b/modules/arte/browser.py @@ -25,7 +25,7 @@ from weboob.capabilities import NotAvailable from weboob.capabilities.image import BaseImage from weboob.tools.json import json as simplejson -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.browser.decorators import id2url from .pages import ArteLivePage, ArteLiveVideoPage @@ -34,7 +34,7 @@ __all__ = ['ArteBrowser'] -class ArteBrowser(BaseBrowser): +class ArteBrowser(Browser): DOMAIN = u'videos.arte.tv' ENCODING = None PAGES = {r'http://concert.arte.tv/\w+': ArteLivePage, @@ -51,7 +51,7 @@ def __init__(self, lang, quality, order, *args, **kwargs): self.lang = lang self.quality = quality self.order = order - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) @id2url(ArteVideo.id2url) def get_video(self, url, video=None): diff --git a/modules/attilasub/browser.py b/modules/attilasub/browser.py index c353789913..b62a30bad8 100644 --- a/modules/attilasub/browser.py +++ b/modules/attilasub/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import SubtitlesPage, SearchPage @@ -26,11 +26,11 @@ __all__ = ['AttilasubBrowser'] -class AttilasubBrowser(BaseBrowser): +class AttilasubBrowser(Browser): DOMAIN = 'davidbillemont3.free.fr' PROTOCOL = 'http' ENCODING = 'windows-1252' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://search.freefind.com/find.html.*': SearchPage, 'http://davidbillemont3.free.fr/.*.htm': SubtitlesPage, diff --git a/modules/aum/browser.py b/modules/aum/browser.py index 954107354b..c1d04260bb 100644 --- a/modules/aum/browser.py +++ b/modules/aum/browser.py @@ -26,7 +26,7 @@ import urllib import urllib2 -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrowserHTTPNotFound, BrowserUnavailable +from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrowserHTTPNotFound, BrowserUnavailable from weboob.tools.json import json from weboob.tools.date import local2utc from weboob.tools.misc import to_unicode @@ -66,7 +66,7 @@ def __init__(self, code): self.code = code -class WebsiteBrowser(BaseBrowser): +class WebsiteBrowser(Browser): def login(self): data = {'username': self.username, 'password': self.password, @@ -115,7 +115,7 @@ def get_profile(self, id): return profile -class AuMBrowser(BaseBrowser): +class AuMBrowser(Browser): DOMAIN = 'www.adopteunmec.com' APIKEY = 'fb0123456789abcd' APITOKEN = 'DCh7Se53v8ejS8466dQe63' @@ -131,7 +131,7 @@ class AuMBrowser(BaseBrowser): def __init__(self, username, password, search_query, *args, **kwargs): kwargs['get_home'] = False - BaseBrowser.__init__(self, username, password, *args, **kwargs) + Browser.__init__(self, username, password, *args, **kwargs) # now we do authentication ourselves #self.add_password('http://www.adopteunmec.com/api/', self.username, self.password) @@ -239,7 +239,7 @@ def get_exception(self, e): if e.getcode() in (410,): return BrowserHTTPNotFound - return BaseBrowser.get_exception(self, e) + return Browser.get_exception(self, e) def home(self): r = self.api_request('home/') diff --git a/modules/axabanque/browser.py b/modules/axabanque/browser.py index f66aafb756..8a1b848d84 100644 --- a/modules/axabanque/browser.py +++ b/modules/axabanque/browser.py @@ -20,7 +20,7 @@ import urllib -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountsPage, TransactionsPage, CBTransactionsPage, UnavailablePage @@ -28,7 +28,7 @@ __all__ = ['AXABanque'] -class AXABanque(BaseBrowser): +class AXABanque(Browser): PROTOCOL = 'https' DOMAIN = 'www.axabanque.fr' PAGES = {'https?://www.axabanque.fr/connexion/index.html.*': LoginPage, diff --git a/modules/banquepopulaire/browser.py b/modules/banquepopulaire/browser.py index 807ada615f..5dd3479368 100644 --- a/modules/banquepopulaire/browser.py +++ b/modules/banquepopulaire/browser.py @@ -20,7 +20,7 @@ import urllib -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrokenPageError +from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrokenPageError from .pages import LoginPage, IndexPage, AccountsPage, CardsPage, TransactionsPage, \ UnavailablePage, RedirectPage, HomePage @@ -29,7 +29,7 @@ __all__ = ['BanquePopulaire'] -class BanquePopulaire(BaseBrowser): +class BanquePopulaire(Browser): PROTOCOL = 'https' ENCODING = 'iso-8859-15' PAGES = {'https://[^/]+/auth/UI/Login.*': LoginPage, @@ -55,7 +55,7 @@ def __init__(self, website, *args, **kwargs): self.DOMAIN = website self.token = None - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def is_logged(self): return not self.is_on_page(LoginPage) diff --git a/modules/barclays/browser.py b/modules/barclays/browser.py index 69febaae4d..24adf5af97 100644 --- a/modules/barclays/browser.py +++ b/modules/barclays/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, Login2Page, IndexPage, AccountsPage, TransactionsPage, \ CardPage, ValuationPage, LoanPage, MarketPage @@ -27,7 +27,7 @@ __all__ = ['Barclays'] -class Barclays(BaseBrowser): +class Barclays(Browser): PROTOCOL = 'https' DOMAIN = 'www.barclays.fr' PAGES = {'https?://.*.barclays.fr/\d-index.html': IndexPage, @@ -44,7 +44,7 @@ class Barclays(BaseBrowser): def __init__(self, secret, *args, **kwargs): self.secret = secret - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def is_logged(self): return self.page is not None and not self.is_on_page((LoginPage, IndexPage, Login2Page)) diff --git a/modules/bnporc/browser.py b/modules/bnporc/browser.py index d238a76eb9..8d3eefaadf 100644 --- a/modules/bnporc/browser.py +++ b/modules/bnporc/browser.py @@ -22,7 +22,7 @@ from datetime import datetime from logging import warning -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrowserPasswordExpired +from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrowserPasswordExpired from weboob.capabilities.bank import TransferError, Transfer from .perso.accounts_list import AccountsList, AccountPrelevement @@ -36,7 +36,7 @@ __all__ = ['BNPorc'] -class BNPorc(BaseBrowser): +class BNPorc(Browser): DOMAIN = 'www.secure.bnpparibas.net' PROTOCOL = 'https' CERTHASH = ['5511f0ff19c982b6351c17b901bfa7419f075edb13f2df41e446248beb7866bb', 'fa8cb72ef2e46054469af916f7ec222b1904901fecde8511a0f769ba0385410d', '86cd4ba8cfbc53937dfc402e8c2d0a2d5ffb630a73bbeafd09c39f8b54a6a6c3'] @@ -66,7 +66,7 @@ class BNPorc(BaseBrowser): def __init__(self, *args, **kwargs): self.rotating_password = kwargs.pop('rotating_password', None) self.password_changed_cb = kwargs.pop('password_changed_cb', None) - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): self.location('https://www.secure.bnpparibas.net/banque/portail/particulier/HomeConnexion?type=homeconnex') diff --git a/modules/bnporc/enterprise/browser.py b/modules/bnporc/enterprise/browser.py index 3c3312781c..a414d5dc9a 100644 --- a/modules/bnporc/enterprise/browser.py +++ b/modules/bnporc/enterprise/browser.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountsPage, HistoryPage, UnknownPage __all__ = ['BNPEnterprise'] -class BNPEnterprise(BaseBrowser): +class BNPEnterprise(Browser): DOMAIN = 'entreprises.bnpparibas.net' PROTOCOL = 'https' CERTHASH = '6789f1e08e18d6578dca88ce2e0354a99dbe7824736c01c9c4fa3b456d03b9e9' diff --git a/modules/boursorama/browser.py b/modules/boursorama/browser.py index 732ec1b54d..9c3abad447 100644 --- a/modules/boursorama/browser.py +++ b/modules/boursorama/browser.py @@ -20,7 +20,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountsList, AccountHistory, CardHistory, UpdateInfoPage, AuthenticationPage @@ -32,7 +32,7 @@ class BrowserIncorrectAuthenticationCode(BrowserIncorrectPassword): pass -class Boursorama(BaseBrowser): +class Boursorama(Browser): DOMAIN = 'www.boursorama.com' PROTOCOL = 'https' CERTHASH = ['6bdf8b6dd177bd417ddcb1cfb818ede153288e44115eb269f2ddd458c8461039', 'b290ef629c88f0508e9cc6305421c173bd4291175e3ddedbee05ee666b34c20e'] @@ -51,7 +51,7 @@ def __init__(self, device="weboob", enable_twofactors=False, *args, **kwargs): self.device = device self.enable_twofactors = enable_twofactors - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): if not self.is_logged(): diff --git a/modules/bouygues/browser.py b/modules/bouygues/browser.py index bdae1dab9f..fd4b69abb1 100644 --- a/modules/bouygues/browser.py +++ b/modules/bouygues/browser.py @@ -21,13 +21,13 @@ from .pages.compose import ComposeFrame, ComposePage, ConfirmPage, SentPage from .pages.login import LoginPage, LoginSASPage -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword __all__ = ['BouyguesBrowser'] -class BouyguesBrowser(BaseBrowser): +class BouyguesBrowser(Browser): DOMAIN = 'www.bouyguestelecom.fr' PAGES = { 'http://www.espaceclient.bouyguestelecom.fr/ECF/jsf/client/envoiSMS/viewEnvoiSMS.jsf': ComposePage, diff --git a/modules/bp/browser.py b/modules/bp/browser.py index 3a0f2b8320..141bd5df92 100644 --- a/modules/bp/browser.py +++ b/modules/bp/browser.py @@ -21,7 +21,7 @@ from urlparse import urlsplit, parse_qsl from datetime import datetime -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrowserBanned +from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrowserBanned from .pages import LoginPage, Initident, CheckPassword, repositionnerCheminCourant, BadLoginPage, AccountDesactivate, \ AccountList, AccountHistory, CardsList, UnavailablePage, \ @@ -33,7 +33,7 @@ __all__ = ['BPBrowser'] -class BPBrowser(BaseBrowser): +class BPBrowser(Browser): DOMAIN = 'voscomptesenligne.labanquepostale.fr' PROTOCOL = 'https' CERTHASH = ['d10d09246853237892d5fb44685826ea99bfdeaaf29fac6dd236dae8cb103c39', 'ccdf2885f1d6df19e15d098dd52fd486609d891ebd2724970a5cfcb9254b6fa5'] @@ -63,7 +63,7 @@ class BPBrowser(BaseBrowser): def __init__(self, *args, **kwargs): kwargs['parser'] = ('lxml',) - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): self.location('https://voscomptesenligne.labanquepostale.fr/wsost/OstBrokerWeb/loginform?TAM_OP=login&' diff --git a/modules/bred/browser.py b/modules/bred/browser.py index f9190333c7..18ed95d651 100644 --- a/modules/bred/browser.py +++ b/modules/bred/browser.py @@ -20,7 +20,7 @@ import urllib -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, LoginResultPage, AccountsPage, EmptyPage, TransactionsPage @@ -28,7 +28,7 @@ __all__ = ['BredBrowser'] -class BredBrowser(BaseBrowser): +class BredBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'www.bred.fr' CERTHASH = ['9b77dab9c84e1dc9e0798de561a6541ff15f038f60b36ca74c29be1def6c19a3', '375f1fed165d34aacaaf71674ab14ca6c1b38404cf748278714fde3c58385ff0', '0853a056453b56aea6a29085ef3f3721b18db2052aa8e84220720d44e0eb22af'] @@ -54,7 +54,7 @@ def __init__(self, website, accnum, *args, **kwargs): self.accnum = accnum.replace(' ','').zfill(11) self.DOMAIN = 'www.%s.fr' % website self.website = website - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def is_logged(self): return self.page is not None and not self.is_on_page(LoginPage) diff --git a/modules/btdigg/browser.py b/modules/btdigg/browser.py index c48d6dc6c9..3499b0673b 100644 --- a/modules/btdigg/browser.py +++ b/modules/btdigg/browser.py @@ -2,7 +2,7 @@ import urllib -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages.index import IndexPage from .pages.torrents import TorrentsPage, TorrentPage @@ -11,11 +11,11 @@ __all__ = ['BTDiggBrowser'] -class BTDiggBrowser(BaseBrowser): +class BTDiggBrowser(Browser): DOMAIN = 'btdigg.org' PROTOCOL = 'https' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = {'https://btdigg.org/': IndexPage, 'https://btdigg.org/search?.*q=[^?]*': TorrentsPage, 'https://btdigg.org/search?.*info_hash=[^?]*': TorrentPage, diff --git a/modules/btmon/browser.py b/modules/btmon/browser.py index 91926a8969..78c6e4d764 100644 --- a/modules/btmon/browser.py +++ b/modules/btmon/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import TorrentsPage, TorrentPage @@ -26,11 +26,11 @@ __all__ = ['BtmonBrowser'] -class BtmonBrowser(BaseBrowser): +class BtmonBrowser(Browser): DOMAIN = 'www.btmon.com' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.btmon.com/torrent/\?f=.*': TorrentsPage, 'http://www.btmon.com/.*torrent.html': TorrentPage, diff --git a/modules/caissedepargne/browser.py b/modules/caissedepargne/browser.py index 98ebde6ce3..001d20d980 100644 --- a/modules/caissedepargne/browser.py +++ b/modules/caissedepargne/browser.py @@ -22,7 +22,7 @@ import hashlib from urlparse import urlsplit -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, IndexPage, ErrorPage, UnavailablePage @@ -30,7 +30,7 @@ __all__ = ['CaisseEpargne'] -class CaisseEpargne(BaseBrowser): +class CaisseEpargne(Browser): DOMAIN = 'www.caisse-epargne.fr' PROTOCOL = 'https' CERTHASH = ['dfff27d6db1fcdf1cea3ab8e3c1ca4f97c971262e95be49f3385b40c97fe640c', '9894ab2088630f341de821a09f1286c525f854f62ac186bd442368b4692c5969'] @@ -43,10 +43,10 @@ class CaisseEpargne(BaseBrowser): def __init__(self, nuser, *args, **kwargs): self.nuser = nuser - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def _certhash(self, domain, port=443): - # XXX overload the BaseBrowser method to force use of TLSv1. + # XXX overload the Browser method to force use of TLSv1. certs = ssl.get_server_certificate((domain, port), ssl_version=ssl.PROTOCOL_TLSv1) return hashlib.sha256(certs).hexdigest() diff --git a/modules/canalplus/browser.py b/modules/canalplus/browser.py index db7dbc6c25..9a0fd551de 100644 --- a/modules/canalplus/browser.py +++ b/modules/canalplus/browser.py @@ -22,7 +22,7 @@ import lxml.etree -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.browser.decorators import id2url from .pages import ChannelsPage, VideoPage @@ -42,7 +42,7 @@ def parse(self, data, encoding=None): return lxml.etree.XML(data.get_data(), parser) -class CanalplusBrowser(BaseBrowser): +class CanalplusBrowser(Browser): DOMAIN = u'service.canal-plus.com' ENCODING = 'utf-8' PAGES = { @@ -60,7 +60,7 @@ class CanalplusBrowser(BaseBrowser): } def __init__(self, quality, *args, **kwargs): - BaseBrowser.__init__(self, parser=self.PARSER, *args, **kwargs) + Browser.__init__(self, parser=self.PARSER, *args, **kwargs) self.quality = self.FORMATS.get(quality, self.FORMATS['hd']) def home(self): diff --git a/modules/canaltp/browser.py b/modules/canaltp/browser.py index e0a58ccf66..57833fa0fb 100644 --- a/modules/canaltp/browser.py +++ b/modules/canaltp/browser.py @@ -20,7 +20,7 @@ from datetime import datetime, date, time -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.misc import to_unicode from weboob.tools.browser import BrokenPageError @@ -28,11 +28,11 @@ __all__ = ['CanalTP'] -class CanalTP(BaseBrowser): +class CanalTP(Browser): DOMAIN = 'widget.canaltp.fr' def __init__(self, **kwargs): - BaseBrowser.__init__(self, '', **kwargs) + Browser.__init__(self, '', **kwargs) def iter_station_search(self, pattern): url = u'http://widget.canaltp.fr/Prochains_departs_15122009/dev/gare.php?txtrech=%s' % unicode(pattern) diff --git a/modules/cappedtv/browser.py b/modules/cappedtv/browser.py index 2803eae78d..d56402a784 100644 --- a/modules/cappedtv/browser.py +++ b/modules/cappedtv/browser.py @@ -15,7 +15,7 @@ from weboob.tools.misc import to_unicode from weboob.tools.browser import Page from weboob.tools.browser import BrokenPageError -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.browser.decorators import id2url from weboob.capabilities.image import BaseImage from weboob.capabilities.video import BaseVideo @@ -100,7 +100,7 @@ def get_video(self, video=None): return video -class CappedBrowser(BaseBrowser): +class CappedBrowser(Browser): DOMAIN = 'capped.tv' PROTOCOL = 'http' ENCODING = None diff --git a/modules/champslibres/browser.py b/modules/champslibres/browser.py index 030fa0cfbf..c82c0b47ca 100644 --- a/modules/champslibres/browser.py +++ b/modules/champslibres/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, HomePage, HistoryPage, RentedPage @@ -27,7 +27,7 @@ # Browser -class ChampslibresBrowser(BaseBrowser): +class ChampslibresBrowser(Browser): PROTOCOL = 'http' ENCODING = 'utf-8' PAGES = { diff --git a/modules/chronopost/browser.py b/modules/chronopost/browser.py index e68392aec3..a93fae365f 100644 --- a/modules/chronopost/browser.py +++ b/modules/chronopost/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import IndexPage, TrackPage @@ -25,7 +25,7 @@ __all__ = ['ChronopostBrowser'] -class ChronopostBrowser(BaseBrowser): +class ChronopostBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.chronopost.fr' ENCODING = None diff --git a/modules/cic/browser.py b/modules/cic/browser.py index 9c90fe3450..5fcbc4cc3c 100644 --- a/modules/cic/browser.py +++ b/modules/cic/browser.py @@ -21,7 +21,7 @@ from urlparse import urlsplit, parse_qsl, urlparse from datetime import datetime, timedelta -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.capabilities.bank import Transfer, TransferError from .pages import LoginPage, LoginErrorPage, AccountsPage, UserSpacePage, EmptyPage, \ @@ -33,12 +33,12 @@ # Browser -class CICBrowser(BaseBrowser): +class CICBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'www.cic.fr' CERTHASH = 'b7f681798d4f414fb5cb4032a0b6e8e0d61eeea564a1fb2c1c5a6fc351c70c50' ENCODING = 'iso-8859-1' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = {'https://www.cic.fr/.*/fr/banques/particuliers/index.html': LoginPage, 'https://www.cic.fr/.*/fr/identification/default.cgi': LoginErrorPage, 'https://www.cic.fr/.*/fr/banque/situation_financiere.cgi': AccountsPage, diff --git a/modules/citelis/browser.py b/modules/citelis/browser.py index 582226c9a1..5cffa99516 100644 --- a/modules/citelis/browser.py +++ b/modules/citelis/browser.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import Account -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, SummaryPage, UselessPage, TransactionSearchPage, TransactionsPage, TransactionsCsvPage @@ -27,7 +27,7 @@ __all__ = ['CitelisBrowser'] -class CitelisBrowser(BaseBrowser): +class CitelisBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'adminpayment.citelis.fr' ENCODING = 'UTF-8' @@ -45,7 +45,7 @@ class CitelisBrowser(BaseBrowser): def __init__(self, merchant_id, *args, **kwargs): self.merchant_id = merchant_id - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def login(self): if not self.is_on_page(LoginPage): diff --git a/modules/cmb/module.py b/modules/cmb/module.py index 51840968da..921303db3a 100644 --- a/modules/cmb/module.py +++ b/modules/cmb/module.py @@ -23,7 +23,7 @@ from weboob.tools.value import ValueBackendPassword from weboob.capabilities.base import NotAvailable from weboob.tools.exceptions import BrowserIncorrectPassword, ParseError -from weboob.tools.browser2 import BaseBrowser +from weboob.tools.browser2 import Browser from re import match, compile, sub from decimal import Decimal @@ -84,7 +84,7 @@ class CmbModule(Module, CapBank): ) ] - BROWSER = BaseBrowser + BROWSER = Browser islogged = False def login(self): diff --git a/modules/cmso/browser.py b/modules/cmso/browser.py index f43a9d1744..d45da6b239 100644 --- a/modules/cmso/browser.py +++ b/modules/cmso/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountsPage, TransactionsPage @@ -26,7 +26,7 @@ __all__ = ['Cmso'] -class Cmso(BaseBrowser): +class Cmso(Browser): PROTOCOL = 'https' DOMAIN = 'www.cmso.com' ENCODING = 'iso-8859-1' diff --git a/modules/colisprive/browser.py b/modules/colisprive/browser.py index 83865d1371..f37c5518c6 100644 --- a/modules/colisprive/browser.py +++ b/modules/colisprive/browser.py @@ -17,14 +17,14 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import TrackPage, ErrorPage __all__ = ['ColispriveBrowser'] -class ColispriveBrowser(BaseBrowser): +class ColispriveBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'www.colisprive.com' ENCODING = 'utf8' diff --git a/modules/colissimo/browser.py b/modules/colissimo/browser.py index ca65a5ce67..1ec1c747b0 100644 --- a/modules/colissimo/browser.py +++ b/modules/colissimo/browser.py @@ -18,17 +18,17 @@ # along with weboob. If not, see . from weboob.tools.json import json -from weboob.tools.browser import BaseBrowser, BrowserBanned +from weboob.tools.browser import Browser, BrowserBanned __all__ = ['ColissimoBrowser'] -class ColissimoBrowser(BaseBrowser): +class ColissimoBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.laposte.fr' ENCODING = None - USER_AGENT = BaseBrowser.USER_AGENTS['android'] + USER_AGENT = Browser.USER_AGENTS['android'] api_key = '6b252eb30d3afb15c47cf3fccee3dc17352dc2d6' diff --git a/modules/cragr/mobile/browser.py b/modules/cragr/mobile/browser.py index 97784210fc..e9fb9acf76 100644 --- a/modules/cragr/mobile/browser.py +++ b/modules/cragr/mobile/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.tools.date import LinearDateGuesser from weboob.capabilities.bank import Transfer, TransferError from .pages import LoginPage, AccountsList @@ -30,10 +30,10 @@ __all__ = ['CragrMobile'] -class CragrMobile(BaseBrowser): +class CragrMobile(Browser): PROTOCOL = 'https' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] # a session id that is sometimes added, and should be ignored when matching pages SESSION_REGEXP = '(?:|%s[A-Z0-9]+)' % re.escape(r';jsessionid=') @@ -49,7 +49,7 @@ def __init__(self, website, *args, **kwargs): 'https://[^/]+/accounting/showAccountDetail.+': AccountsList, 'https://[^/]+/accounting/showMoreAccountOperations.*': AccountsList, } - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def viewing_html(self): """ @@ -82,7 +82,7 @@ def login(self): # Are we on the good page? if not self.is_on_page(LoginPage): self.logger.debug('going to login page') - BaseBrowser.home(self) + Browser.home(self) self.logger.debug('attempting to log in') self.page.login(self.username, self.password) self.is_logging = False @@ -109,7 +109,7 @@ def home(self): return # simply go to http(s)://the.doma.in/ - BaseBrowser.home(self) + Browser.home(self) if self.is_on_page(LoginPage): if not self.is_logged(): diff --git a/modules/cragr/web/browser.py b/modules/cragr/web/browser.py index 0c537adfd5..6d94d73a11 100644 --- a/modules/cragr/web/browser.py +++ b/modules/cragr/web/browser.py @@ -21,7 +21,7 @@ import urllib import re -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.tools.date import LinearDateGuesser from .pages import HomePage, LoginPage, LoginErrorPage, AccountsPage, \ @@ -31,7 +31,7 @@ __all__ = ['Cragr'] -class Cragr(BaseBrowser): +class Cragr(Browser): PROTOCOL = 'https' ENCODING = 'ISO-8859-1' @@ -54,7 +54,7 @@ class WebsiteNotSupported(Exception): def __init__(self, website, *args, **kwargs): self.DOMAIN = re.sub('^m\.', 'www.', website) self.accounts_url = None - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): self.login() diff --git a/modules/creditcooperatif/perso/browser.py b/modules/creditcooperatif/perso/browser.py index 37d421edec..30813f3d4e 100644 --- a/modules/creditcooperatif/perso/browser.py +++ b/modules/creditcooperatif/perso/browser.py @@ -19,7 +19,7 @@ import urllib -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, LoggedPage, AccountsPage, TransactionsPage, TransactionsJSONPage, ComingTransactionsPage @@ -27,7 +27,7 @@ __all__ = ['CreditCooperatif'] -class CreditCooperatif(BaseBrowser): +class CreditCooperatif(Browser): PROTOCOL = 'https' ENCODING = 'iso-8859-15' DOMAIN = "www.credit-cooperatif.coop" diff --git a/modules/creditcooperatif/pro/browser.py b/modules/creditcooperatif/pro/browser.py index c50a7bfc63..b40291b372 100644 --- a/modules/creditcooperatif/pro/browser.py +++ b/modules/creditcooperatif/pro/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountsPage, ITransactionsPage, TransactionsPage, ComingTransactionsPage, CardTransactionsPage @@ -25,7 +25,7 @@ __all__ = ['CreditCooperatif'] -class CreditCooperatif(BaseBrowser): +class CreditCooperatif(Browser): PROTOCOL = 'https' ENCODING = 'iso-8859-15' DOMAIN = "www.coopanet.com" @@ -40,7 +40,7 @@ class CreditCooperatif(BaseBrowser): def __init__(self, *args, **kwargs): self.strong_auth = kwargs.pop('strong_auth', False) - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): self.location("/banque/sso/") diff --git a/modules/creditdunord/browser.py b/modules/creditdunord/browser.py index 9d98888ae2..705e8fc128 100644 --- a/modules/creditdunord/browser.py +++ b/modules/creditdunord/browser.py @@ -21,7 +21,7 @@ import re import urllib -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountsPage, ProAccountsPage, TransactionsPage, ProTransactionsPage @@ -29,7 +29,7 @@ __all__ = ['CreditDuNordBrowser'] -class CreditDuNordBrowser(BaseBrowser): +class CreditDuNordBrowser(Browser): PROTOCOL = 'https' ENCODING = 'UTF-8' PAGES = {'https://[^/]+/?': LoginPage, @@ -43,7 +43,7 @@ class CreditDuNordBrowser(BaseBrowser): def __init__(self, website, *args, **kwargs): self.DOMAIN = website - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def is_logged(self): return self.page is not None and not self.is_on_page(LoginPage) diff --git a/modules/cuisineaz/browser.py b/modules/cuisineaz/browser.py index 2f85ea56cf..fce4887e50 100644 --- a/modules/cuisineaz/browser.py +++ b/modules/cuisineaz/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import RecipePage, ResultsPage @@ -26,11 +26,11 @@ __all__ = ['CuisineazBrowser'] -class CuisineazBrowser(BaseBrowser): +class CuisineazBrowser(Browser): DOMAIN = 'www.cuisineaz.com' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.cuisineaz.com/recettes/recherche_v2.aspx\?recherche=.*': ResultsPage, 'http://www.cuisineaz.com/recettes/.*[0-9]*.aspx': RecipePage, diff --git a/modules/dailymotion/browser.py b/modules/dailymotion/browser.py index 5d86aebdf6..c531679eac 100644 --- a/modules/dailymotion/browser.py +++ b/modules/dailymotion/browser.py @@ -19,7 +19,7 @@ from urllib import quote_plus -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.browser.decorators import id2url from .pages import IndexPage, VideoPage, KidsVideoPage @@ -29,7 +29,7 @@ __all__ = ['DailymotionBrowser'] -class DailymotionBrowser(BaseBrowser): +class DailymotionBrowser(Browser): DOMAIN = 'www.dailymotion.com' ENCODING = None PAGES = {r'http://[w\.]*dailymotion\.com/1': IndexPage, diff --git a/modules/delubac/browser.py b/modules/delubac/browser.py index d6c8bf7cf3..1c4ccc8c3e 100644 --- a/modules/delubac/browser.py +++ b/modules/delubac/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, DashboardPage, OperationsPage, LCRPage @@ -26,7 +26,7 @@ __all__ = ['DelubacBrowser'] -class DelubacBrowser(BaseBrowser): +class DelubacBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'vbankonline.delubac.com' ENCODING = None diff --git a/modules/dlfp/browser.py b/modules/dlfp/browser.py index 46a37edada..5765a3b5cc 100644 --- a/modules/dlfp/browser.py +++ b/modules/dlfp/browser.py @@ -23,7 +23,7 @@ import hashlib import lxml -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound, BrowserHTTPError, BrowserIncorrectPassword, BrokenPageError +from weboob.tools.browser import Browser, BrowserHTTPNotFound, BrowserHTTPError, BrowserIncorrectPassword, BrokenPageError from weboob.capabilities.messages import CantSendMessage from .pages.index import IndexPage, LoginPage @@ -35,7 +35,7 @@ # Browser -class DLFP(BaseBrowser): +class DLFP(Browser): DOMAIN = 'linuxfr.org' PROTOCOL = 'https' PAGES = {'https?://[^/]*linuxfr\.org/?': IndexPage, diff --git a/modules/edf/browser.py b/modules/edf/browser.py index 63e1e8c208..d853b1f374 100644 --- a/modules/edf/browser.py +++ b/modules/edf/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.capabilities.bill import Detail from decimal import Decimal from .pages import LoginPage, FirstRedirectionPage, SecondRedirectionPage, OtherPage, AccountPage, BillsPage, LastPaymentsPage, LastPaymentsPage2 @@ -25,7 +25,7 @@ __all__ = ['EdfBrowser'] -class EdfBrowser(BaseBrowser): +class EdfBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'monagencepart.edf.fr' ENCODING = None diff --git a/modules/ehentai/browser.py b/modules/ehentai/browser.py index 5fb386fddd..96a8bc218a 100644 --- a/modules/ehentai/browser.py +++ b/modules/ehentai/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from urllib import urlencode from .pages import IndexPage, GalleryPage, ImagePage, HomePage, LoginPage @@ -27,7 +27,7 @@ __all__ = ['EHentaiBrowser'] -class EHentaiBrowser(BaseBrowser): +class EHentaiBrowser(Browser): ENCODING = None PAGES = { r'http://[^/]+/': IndexPage, @@ -41,7 +41,7 @@ class EHentaiBrowser(BaseBrowser): def __init__(self, domain, username, password, *args, **kwargs): self.DOMAIN = domain self.logged = False - BaseBrowser.__init__(self, parser=('lxmlsoup',), *args, **kwargs) + Browser.__init__(self, parser=('lxmlsoup',), *args, **kwargs) if password: self.login(username, password) diff --git a/modules/europarl/browser.py b/modules/europarl/browser.py index 734bd21af1..2718f98b22 100644 --- a/modules/europarl/browser.py +++ b/modules/europarl/browser.py @@ -19,7 +19,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.browser.decorators import id2url #from .pages.index import IndexPage @@ -30,7 +30,7 @@ __all__ = ['EuroparlBrowser'] -class EuroparlBrowser(BaseBrowser): +class EuroparlBrowser(Browser): DOMAIN = 'europarl.europa.eu' ENCODING = None PAGES = {r'http://[w\.]*europarl\.europa\.eu/ep-live/(?P\w+)/committees/video\?.*event=(?P[^&]+).*': VideoPage, diff --git a/modules/fortuneo/browser.py b/modules/fortuneo/browser.py index 172ed7f0c5..eff32095d2 100644 --- a/modules/fortuneo/browser.py +++ b/modules/fortuneo/browser.py @@ -22,7 +22,7 @@ from datetime import date from dateutil.relativedelta import relativedelta -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages.login import LoginPage from .pages.accounts_list import GlobalAccountsList, AccountsList, AccountHistoryPage @@ -30,7 +30,7 @@ __all__ = ['Fortuneo'] -class Fortuneo(BaseBrowser): +class Fortuneo(Browser): DOMAIN_LOGIN = 'www.fortuneo.fr' DOMAIN = 'www.fortuneo.fr' PROTOCOL = 'https' @@ -49,7 +49,7 @@ class Fortuneo(BaseBrowser): } def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): """main page (login)""" diff --git a/modules/fourchan/browser.py b/modules/fourchan/browser.py index 59411ab437..a9ae22474a 100644 --- a/modules/fourchan/browser.py +++ b/modules/fourchan/browser.py @@ -18,12 +18,12 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages.board import BoardPage -class FourChan(BaseBrowser): +class FourChan(Browser): DOMAIN = 'boards.4chan.org' PAGES = { 'http://boards.4chan.org/\w+/': BoardPage, diff --git a/modules/ganassurances/browser.py b/modules/ganassurances/browser.py index 184e04228f..8251fc101b 100644 --- a/modules/ganassurances/browser.py +++ b/modules/ganassurances/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountsPage, TransactionsPage @@ -26,7 +26,7 @@ __all__ = ['GanAssurances'] -class GanAssurances(BaseBrowser): +class GanAssurances(Browser): PROTOCOL = 'https' PAGES = {'https://[^/]+/wps/portal/login.*': LoginPage, 'https://[^/]+/wps/myportal/TableauDeBord': AccountsPage, @@ -35,7 +35,7 @@ class GanAssurances(BaseBrowser): def __init__(self, website, *args, **kwargs): self.DOMAIN = website - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def is_logged(self): return self.page is not None and not self.is_on_page(LoginPage) diff --git a/modules/gazelle/browser.py b/modules/gazelle/browser.py index 2f5c627d1b..d0247afa30 100644 --- a/modules/gazelle/browser.py +++ b/modules/gazelle/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages.index import IndexPage, LoginPage from .pages.torrents import TorrentsPage @@ -27,7 +27,7 @@ __all__ = ['GazelleBrowser'] -class GazelleBrowser(BaseBrowser): +class GazelleBrowser(Browser): PAGES = {'https?://[^/]+/?(index.php)?': IndexPage, 'https?://[^/]+/login.php': LoginPage, 'https?://[^/]+/torrents.php.*': TorrentsPage, @@ -36,7 +36,7 @@ class GazelleBrowser(BaseBrowser): def __init__(self, protocol, domain, *args, **kwargs): self.DOMAIN = domain self.PROTOCOL = protocol - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def login(self): if not self.is_on_page(LoginPage): diff --git a/modules/gdcvault/browser.py b/modules/gdcvault/browser.py index f4e0c12e12..cb1180e9ec 100644 --- a/modules/gdcvault/browser.py +++ b/modules/gdcvault/browser.py @@ -20,7 +20,7 @@ import urllib -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrowserUnavailable,\ +from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrowserUnavailable,\ BrowserBanned from weboob.tools.browser.decorators import id2url @@ -36,7 +36,7 @@ __all__ = ['GDCVaultBrowser'] -class GDCVaultBrowser(BaseBrowser): +class GDCVaultBrowser(Browser): DOMAIN = 'gdcvault.com' ENCODING = 'utf-8' PAGES = {r'http://[w\.]*gdcvault.com/play/(?P[\d]+)/?.*': VideoPage, diff --git a/modules/gdfsuez/browser.py b/modules/gdfsuez/browser.py index 9850a47b4e..d771f9445f 100644 --- a/modules/gdfsuez/browser.py +++ b/modules/gdfsuez/browser.py @@ -18,13 +18,13 @@ # along with weboob. If not, see . import StringIO -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, HomePage, AccountPage, TimeoutPage, HistoryPage, PdfPage __all__ = ['GdfSuez'] -class GdfSuez(BaseBrowser): +class GdfSuez(Browser): PROTOCOL = 'https' DOMAIN = 'www.gdfsuez-dolcevita.fr' PAGES = {'.*portail/clients.*?_nfpb=true&_pageLabel=page_identification': LoginPage, @@ -40,7 +40,7 @@ class GdfSuez(BaseBrowser): historyp = '/portailClients/client/p/page_historique_de_mes_factures' def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): self.location(self.homep) diff --git a/modules/geolocip/module.py b/modules/geolocip/module.py index 686e288ebd..6835053899 100644 --- a/modules/geolocip/module.py +++ b/modules/geolocip/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.geolocip import CapGeolocIp, IpLocation from weboob.tools.backend import Module -from weboob.tools.browser import BaseBrowser, BrowserUnavailable +from weboob.tools.browser import Browser, BrowserUnavailable __all__ = ['GeolocIpModule'] @@ -34,7 +34,7 @@ class GeolocIpModule(Module, CapGeolocIp): VERSION = '1.0' LICENSE = 'AGPLv3+' DESCRIPTION = u"GeolocIP IP addresses geolocation service" - BROWSER = BaseBrowser + BROWSER = Browser def get_location(self, ipaddr): with self.browser: diff --git a/modules/github/browser.py b/modules/github/browser.py index 6a026922f7..679df2d0d4 100644 --- a/modules/github/browser.py +++ b/modules/github/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.json import json as json_module from base64 import b64encode import datetime @@ -31,14 +31,14 @@ -class GithubBrowser(BaseBrowser): +class GithubBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'api.github.com' ENCODING = 'utf-8' def __init__(self, *a, **kw): kw['parser'] = 'json' - BaseBrowser.__init__(self, *a, **kw) + Browser.__init__(self, *a, **kw) self.fewer_requests = not bool(self.username) def home(self): diff --git a/modules/googletranslate/browser.py b/modules/googletranslate/browser.py index 1dc860522c..82102e606f 100644 --- a/modules/googletranslate/browser.py +++ b/modules/googletranslate/browser.py @@ -20,7 +20,7 @@ import urllib -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import TranslatePage @@ -28,16 +28,16 @@ __all__ = ['GoogleTranslateBrowser'] -class GoogleTranslateBrowser(BaseBrowser): +class GoogleTranslateBrowser(Browser): DOMAIN = 'translate.google.com' ENCODING = 'UTF-8' - USER_AGENT = BaseBrowser.USER_AGENTS['desktop_firefox'] + USER_AGENT = Browser.USER_AGENTS['desktop_firefox'] PAGES = { 'https?://translate\.google\.com': TranslatePage } def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def translate(self, source, to, text): """ diff --git a/modules/grooveshark/browser.py b/modules/grooveshark/browser.py index 9853c6776e..5eb6d31d7e 100644 --- a/modules/grooveshark/browser.py +++ b/modules/grooveshark/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.tools.json import json as simplejson from weboob.capabilities.audio import BaseAudio, Album, Playlist from weboob.capabilities.image import BaseImage @@ -42,7 +42,7 @@ class APIError(Exception): pass -class GroovesharkBrowser(BaseBrowser): +class GroovesharkBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'html5.grooveshark.com' API_URL = 'https://html5.grooveshark.com/more.php' diff --git a/modules/guerrillamail/browser.py b/modules/guerrillamail/browser.py index 260df5d410..49eaef824d 100644 --- a/modules/guerrillamail/browser.py +++ b/modules/guerrillamail/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.date import datetime from weboob.tools.parsers.jsonparser import json from urllib import urlencode @@ -29,14 +29,14 @@ __all__ = ['GuerrillamailBrowser'] -class GuerrillamailBrowser(BaseBrowser): +class GuerrillamailBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'www.guerrillamail.com' ENCODING = 'utf-8' def __init__(self, *args, **kw): kw['parser'] = 'raw' - BaseBrowser.__init__(self, *args, **kw) + Browser.__init__(self, *args, **kw) def _get_unicode(self, url, *a): return self.get_document(self.openurl(url, *a)).decode(self.ENCODING, 'replace') diff --git a/modules/hds/browser.py b/modules/hds/browser.py index 68c9a11e5c..2c29e21e50 100644 --- a/modules/hds/browser.py +++ b/modules/hds/browser.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import ValidationPage, HomePage, HistoryPage, StoryPage, AuthorPage # Browser -class HDSBrowser(BaseBrowser): +class HDSBrowser(Browser): ENCODING = 'ISO-8859-1' DOMAIN = 'histoires-de-sexe.net' PAGES = {'http://histoires-de-sexe.net/': ValidationPage, diff --git a/modules/hellobank/browser.py b/modules/hellobank/browser.py index a29154a38a..3897192e89 100644 --- a/modules/hellobank/browser.py +++ b/modules/hellobank/browser.py @@ -23,7 +23,7 @@ import mechanize from datetime import datetime -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrowserPasswordExpired +from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrowserPasswordExpired from weboob.capabilities.bank import TransferError, Transfer from .perso.accounts_list import AccountsList, AccountPrelevement @@ -35,7 +35,7 @@ __all__ = ['HelloBank'] -class HelloBank(BaseBrowser): +class HelloBank(Browser): DOMAIN = 'client.hellobank.fr' PROTOCOL = 'https' ENCODING = None # refer to the HTML encoding @@ -55,7 +55,7 @@ class HelloBank(BaseBrowser): } def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): self.location('https://client.hellobank.fr/banque/portail/digitale/HomeConnexion?type=homeconnex') diff --git a/modules/imdb/browser.py b/modules/imdb/browser.py index 15864ce544..efb1a6333f 100644 --- a/modules/imdb/browser.py +++ b/modules/imdb/browser.py @@ -20,7 +20,7 @@ import re from HTMLParser import HTMLParser -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from weboob.capabilities.base import NotAvailable, NotLoaded from weboob.capabilities.cinema import Movie, Person from weboob.tools.json import json @@ -32,11 +32,11 @@ __all__ = ['ImdbBrowser'] -class ImdbBrowser(BaseBrowser): +class ImdbBrowser(Browser): DOMAIN = 'www.imdb.com' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.imdb.com/title/tt[0-9]*/fullcredits.*': MovieCrewPage, 'http://www.imdb.com/title/tt[0-9]*/releaseinfo.*': ReleasePage, diff --git a/modules/ina/browser.py b/modules/ina/browser.py index b3865e94c7..04e6c324ae 100644 --- a/modules/ina/browser.py +++ b/modules/ina/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.browser.decorators import id2url from .pages.video import VideoPage @@ -29,7 +29,7 @@ __all__ = ['InaBrowser'] -class InaBrowser(BaseBrowser): +class InaBrowser(Browser): DOMAIN = 'ina.fr' PAGES = {'http://player.ina.fr/notices/.+\.mrss': (VideoPage, 'xml'), 'http://boutique\.ina\.fr/recherche/.+': SearchPage, diff --git a/modules/inrocks/browser.py b/modules/inrocks/browser.py index 97563c75f9..d59f55048c 100644 --- a/modules/inrocks/browser.py +++ b/modules/inrocks/browser.py @@ -20,10 +20,10 @@ from .pages.article import ArticlePage from .pages.inrockstv import InrocksTvPage -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser -class NewspaperInrocksBrowser(BaseBrowser): +class NewspaperInrocksBrowser(Browser): "NewspaperInrocksBrowser class" PAGES = { 'http://www.lesinrocks.com/(?!inrockstv).+/.*': ArticlePage, diff --git a/modules/izneo/module.py b/modules/izneo/module.py index 154490370d..9873f68217 100644 --- a/modules/izneo/module.py +++ b/modules/izneo/module.py @@ -24,7 +24,7 @@ from weboob.capabilities.gallery import CapGallery, BaseGallery, BaseImage from weboob.tools.json import json from weboob.tools.backend import Module -from weboob.tools.browser import BaseBrowser, Page +from weboob.tools.browser import Browser, Page __all__ = ['IzneoModule'] @@ -47,7 +47,7 @@ def iter_gallery_images(self, gallery): (page['expires'], page['token'], ean, width, page['page']))) -class IzneoBrowser(BaseBrowser): +class IzneoBrowser(Browser): PAGES = {r'http://.+\.izneo.\w+/readv2-.+': ReaderV2} def iter_gallery_images(self, gallery): diff --git a/modules/jacquieetmichel/browser.py b/modules/jacquieetmichel/browser.py index 238837ebe2..1d94b2eb32 100644 --- a/modules/jacquieetmichel/browser.py +++ b/modules/jacquieetmichel/browser.py @@ -19,7 +19,7 @@ import urllib -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.browser.decorators import id2url from .video import JacquieEtMichelVideo @@ -29,7 +29,7 @@ __all__ = ['JacquieEtMichelBrowser'] -class JacquieEtMichelBrowser(BaseBrowser): +class JacquieEtMichelBrowser(Browser): DOMAIN = u'jacquieetmicheltv.net' ENCODING = None PAGES = {r'https?://.*jacquieetmicheltv.net/': ResultsPage, diff --git a/modules/jcvelaux/browser.py b/modules/jcvelaux/browser.py index 43a30fdc64..aad77462c7 100644 --- a/modules/jcvelaux/browser.py +++ b/modules/jcvelaux/browser.py @@ -19,13 +19,13 @@ import datetime -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser __all__ = ['VelibBrowser'] -class VelibBrowser(BaseBrowser): +class VelibBrowser(Browser): ENCODING = 'utf-8' API_KEY = '2282a34b49cf45d8129cdf93d88762914cece88b' @@ -33,7 +33,7 @@ class VelibBrowser(BaseBrowser): def __init__(self, *a, **kw): kw['parser'] = 'json' - BaseBrowser.__init__(self, *a, **kw) + Browser.__init__(self, *a, **kw) def do_get(self, path, **query): qs = '&'.join('%s=%s' % kv for kv in query.items()) diff --git a/modules/jvmalin/browser.py b/modules/jvmalin/browser.py index bc71152afc..c47dc7914d 100644 --- a/modules/jvmalin/browser.py +++ b/modules/jvmalin/browser.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import RoadmapSearchPage, RoadmapResultsPage, RoadmapPage, RoadmapAmbiguity __all__ = ['JVMalin'] -class JVMalin(BaseBrowser): +class JVMalin(Browser): DOMAIN = 'www.jvmalin.fr' PAGES = { 'http://www\.jvmalin\.fr/Itineraires/Recherche.*': RoadmapSearchPage, @@ -34,7 +34,7 @@ class JVMalin(BaseBrowser): } def __init__(self, **kwargs): - BaseBrowser.__init__(self, '', **kwargs) + Browser.__init__(self, '', **kwargs) def get_roadmap(self, departure, arrival, filters): self.location('/Itineraires/Recherche') diff --git a/modules/kickass/browser.py b/modules/kickass/browser.py index 7fca25ab5f..88688d3c8d 100644 --- a/modules/kickass/browser.py +++ b/modules/kickass/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import TorrentsPage, TorrentPage @@ -26,11 +26,11 @@ __all__ = ['KickassBrowser'] -class KickassBrowser(BaseBrowser): +class KickassBrowser(Browser): DOMAIN = 'kickass.to' PROTOCOL = 'https' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'https://kickass.to/usearch/.*field=seeders&sorder=desc': TorrentsPage, 'https://kickass.to/.*.html': TorrentPage, diff --git a/modules/lacentrale/browser.py b/modules/lacentrale/browser.py index 0d6200c70e..f114ee20e5 100644 --- a/modules/lacentrale/browser.py +++ b/modules/lacentrale/browser.py @@ -20,7 +20,7 @@ import re -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import MainPage, ListingAutoPage, AnnoncePage @@ -29,7 +29,7 @@ # I manage urls and page location, then trasnfert to page -class LaCentraleBrowser(BaseBrowser): +class LaCentraleBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.lacentrale.fr' ENCODING = 'windows-1252' diff --git a/modules/lcl/browser.py b/modules/lcl/browser.py index 5d955f9aa1..f4765f1493 100644 --- a/modules/lcl/browser.py +++ b/modules/lcl/browser.py @@ -21,7 +21,7 @@ from urlparse import urlsplit, parse_qsl from mechanize import Cookie -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import SkipPage, LoginPage, AccountsPage, AccountHistoryPage, \ CBListPage, CBHistoryPage, ContractsPage @@ -31,12 +31,12 @@ # Browser -class LCLBrowser(BaseBrowser): +class LCLBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'particuliers.secure.lcl.fr' CERTHASH = ['825a1cda9f3c7176af327013a20145ad587d1f7e2a7e226a1cb5c522e6e00b84'] ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'https://particuliers.secure.lcl.fr/outil/UAUT/Authentication/authenticate': LoginPage, 'https://particuliers.secure.lcl.fr/outil/UAUT\?from=.*': LoginPage, @@ -127,7 +127,7 @@ class LCLProBrowser(LCLBrowser): DOMAIN = 'professionnels.secure.lcl.fr' CERTHASH = ['6ae7053ef30f7c7810673115b021a42713f518f3a87b2e73ef565c16ead79f81'] ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'https://professionnels.secure.lcl.fr/outil/UAUT?from=/outil/UWHO/Accueil/': LoginPage, 'https://professionnels.secure.lcl.fr/outil/UAUT\?from=.*': LoginPage, @@ -163,6 +163,6 @@ def add_cookie(self, name, value): cookiejar.set_cookie(c) def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) self.add_cookie("lclgen","professionnels") diff --git a/modules/lcl/enterprise/browser.py b/modules/lcl/enterprise/browser.py index f9be2f9d17..df4790441d 100644 --- a/modules/lcl/enterprise/browser.py +++ b/modules/lcl/enterprise/browser.py @@ -19,7 +19,7 @@ from urllib import urlencode -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import HomePage, MessagesPage, LogoutPage, LogoutOkPage, \ AlreadyConnectedPage, ExpiredPage, MovementsPage, RootPage @@ -28,14 +28,14 @@ __all__ = ['LCLEnterpriseBrowser'] -class LCLEnterpriseBrowser(BaseBrowser): +class LCLEnterpriseBrowser(Browser): BASEURL = 'https://entreprises.secure.lcl.fr' CERTHASH = ['04e3509c20ac8bdbdb3d0ed37bc34db2dde5ed4bc4c30a3605f63403413099a9', '5fcf4a9ceeec25e406a04dffe0c6eacbdf72d11d394cd049701bfbaba3d853d9', '774ac6f1c419083541a27d95672a87a5edf5c82d948368008eab2764e65866f9', '3db256edfeb7ba255625724b7e62d4dab229557226336ba87b9753006721f16f'] ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] def __init__(self, *args, **kwargs): BASEURL = self.BASEURL.rstrip('/') @@ -60,7 +60,7 @@ def __init__(self, *args, **kwargs): BASEURL + '/outil/IQEN/Authentication/sessionExpiree': ExpiredPage, } - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) self._logged = False def deinit(self): diff --git a/modules/leclercmobile/browser.py b/modules/leclercmobile/browser.py index 633fb4f4e2..c0d9d0cfbe 100644 --- a/modules/leclercmobile/browser.py +++ b/modules/leclercmobile/browser.py @@ -20,7 +20,7 @@ import time import StringIO -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import HomePage, LoginPage, HistoryPage, PdfPage from weboob.capabilities.bill import Detail from weboob.capabilities.base import NotAvailable @@ -29,7 +29,7 @@ __all__ = ['Leclercmobile'] -class Leclercmobile(BaseBrowser): +class Leclercmobile(Browser): DOMAIN = 'www.securelmobile.fr' PROTOCOL = 'https' ENCODING = 'utf-8' @@ -44,7 +44,7 @@ class Leclercmobile(BaseBrowser): bills = '/EspaceClient/pgeWERL015_RecupReleveConso.aspx?m=-' def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): self.location(self.accueil) diff --git a/modules/lefigaro/browser.py b/modules/lefigaro/browser.py index ad899aec49..7b31c18343 100644 --- a/modules/lefigaro/browser.py +++ b/modules/lefigaro/browser.py @@ -20,14 +20,14 @@ from .pages.article import ArticlePage, ActuPage from .pages.flashactu import FlashActuPage -from weboob.tools.browser import BaseBrowser, Page +from weboob.tools.browser import Browser, Page class IndexPage(Page): pass -class NewspaperFigaroBrowser(BaseBrowser): +class NewspaperFigaroBrowser(Browser): "NewspaperFigaroBrowser class" ENCODING = "UTF-8" PAGES = {"http://\w+.lefigaro.fr/flash-.*/(\d{4})/(\d{2})/(\d{2})/(.*$)": FlashActuPage, diff --git a/modules/liberation/browser.py b/modules/liberation/browser.py index d36e070700..99e284a4c8 100644 --- a/modules/liberation/browser.py +++ b/modules/liberation/browser.py @@ -18,10 +18,10 @@ # along with weboob. If not, see . from .pages.article import ArticlePage -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser -class NewspaperLibeBrowser(BaseBrowser): +class NewspaperLibeBrowser(Browser): "NewspaperLibeBrowser class" PAGES = {"http://.*liberation.fr/.*": ArticlePage} diff --git a/modules/lolix/browser.py b/modules/lolix/browser.py index 323bf6bf5d..e68ac0dc74 100644 --- a/modules/lolix/browser.py +++ b/modules/lolix/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.tools.browser.decorators import id2url -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .job import LolixJobAdvert from .pages import SearchPage, AdvertPage import urllib @@ -26,7 +26,7 @@ __all__ = ['LolixBrowser'] -class LolixBrowser(BaseBrowser): +class LolixBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'fr.lolix.org/search/offre' ENCODING = 'iso-8859-1' diff --git a/modules/lutim/browser.py b/modules/lutim/browser.py index df04bf33aa..07bcf3347d 100644 --- a/modules/lutim/browser.py +++ b/modules/lutim/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from StringIO import StringIO import re @@ -28,11 +28,11 @@ __all__ = ['LutimBrowser'] -class LutimBrowser(BaseBrowser): +class LutimBrowser(Browser): ENCODING = 'utf-8' def __init__(self, base_url, *args, **kw): - BaseBrowser.__init__(self, *args, **kw) + Browser.__init__(self, *args, **kw) self.base_url = base_url self.PAGES = {re.escape(self.base_url): PageAll} diff --git a/modules/mailinator/browser.py b/modules/mailinator/browser.py index 97429f36bc..e79ff440fb 100644 --- a/modules/mailinator/browser.py +++ b/modules/mailinator/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserBanned +from weboob.tools.browser import Browser, BrowserBanned from weboob.tools.date import datetime from weboob.tools.parsers.jsonparser import json import lxml.html @@ -28,14 +28,14 @@ __all__ = ['MailinatorBrowser'] -class MailinatorBrowser(BaseBrowser): +class MailinatorBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'mailinator.com' ENCODING = 'utf-8' def __init__(self, *args, **kw): kw['parser'] = 'raw' - BaseBrowser.__init__(self, *args, **kw) + Browser.__init__(self, *args, **kw) def _get_unicode(self, url): return self.get_document(self.openurl(url)).decode(self.ENCODING, 'replace') diff --git a/modules/marmiton/browser.py b/modules/marmiton/browser.py index 526cf91392..dcceb36e81 100644 --- a/modules/marmiton/browser.py +++ b/modules/marmiton/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import RecipePage, ResultsPage @@ -26,11 +26,11 @@ __all__ = ['MarmitonBrowser'] -class MarmitonBrowser(BaseBrowser): +class MarmitonBrowser(Browser): DOMAIN = 'www.marmiton.org' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.marmiton.org/recettes/recherche.aspx.*': ResultsPage, 'http://www.marmiton.org/recettes/recette_.*': RecipePage, diff --git a/modules/mediawiki/browser.py b/modules/mediawiki/browser.py index 1ff578b178..66ec23f1f0 100644 --- a/modules/mediawiki/browser.py +++ b/modules/mediawiki/browser.py @@ -22,7 +22,7 @@ import datetime import re -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.tools.json import json as simplejson from weboob.capabilities.content import Revision @@ -34,7 +34,7 @@ class APIError(Exception): # Browser -class MediawikiBrowser(BaseBrowser): +class MediawikiBrowser(Browser): ENCODING = 'utf-8' def __init__(self, url, apiurl, *args, **kwargs): @@ -46,7 +46,7 @@ def __init__(self, url, apiurl, *args, **kwargs): self.BASEPATH = self.BASEPATH[:-1] self.apiurl = apiurl - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def url2page(self, page): baseurl = self.PROTOCOL + '://' + self.DOMAIN + self.BASEPATH diff --git a/modules/meteofrance/browser.py b/modules/meteofrance/browser.py index 4503ac927c..e6188f1559 100644 --- a/modules/meteofrance/browser.py +++ b/modules/meteofrance/browser.py @@ -20,14 +20,14 @@ import urllib -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages.meteo import WeatherPage, SearchCitiesPage from weboob.capabilities.weather import CityNotFound __all__ = ['MeteofranceBrowser'] -class MeteofranceBrowser(BaseBrowser): +class MeteofranceBrowser(Browser): DOMAIN = 'www.meteofrance.com' PROTOCOL = 'http' ENCODING = 'utf-8' @@ -39,7 +39,7 @@ class MeteofranceBrowser(BaseBrowser): } def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def iter_city_search(self, pattern): datas = {'facet': 'previsions', diff --git a/modules/minutes20/browser.py b/modules/minutes20/browser.py index 0c977318b4..650d86c128 100644 --- a/modules/minutes20/browser.py +++ b/modules/minutes20/browser.py @@ -20,11 +20,11 @@ from .pages.article import ArticlePage from .pages.simple import SimplePage -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .tools import id2url -class Newspaper20minutesBrowser(BaseBrowser): +class Newspaper20minutesBrowser(Browser): "Newspaper20minutesBrowser class" ENCODING = None PAGES = { diff --git a/modules/monster/browser.py b/modules/monster/browser.py index 58c88708aa..0bd351a5e9 100644 --- a/modules/monster/browser.py +++ b/modules/monster/browser.py @@ -19,7 +19,7 @@ import urllib from weboob.tools.browser.decorators import id2url -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import SearchPage, AdvertPage from .job import MonsterJobAdvert @@ -27,7 +27,7 @@ __all__ = ['MonsterBrowser'] -class MonsterBrowser(BaseBrowser): +class MonsterBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'offres.monster.fr' ENCODING = 'utf-8' diff --git a/modules/nectarine/browser.py b/modules/nectarine/browser.py index 70cbec4fe9..29817bb635 100644 --- a/modules/nectarine/browser.py +++ b/modules/nectarine/browser.py @@ -17,16 +17,16 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import LivePage, StreamsPage __all__ = ['NectarineBrowser'] -class NectarineBrowser(BaseBrowser): +class NectarineBrowser(Browser): DOMAIN = 'www.scenemusic.net' PROTOCOL = 'https' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['desktop_firefox'] + USER_AGENT = Browser.USER_AGENTS['desktop_firefox'] PAGES = { 'https://www\.scenemusic\.net/demovibes/xml/streams/': StreamsPage, 'https://www\.scenemusic\.net/demovibes/xml/queue/': LivePage diff --git a/modules/nettokom/browser.py b/modules/nettokom/browser.py index fa30e02e08..aa6c876522 100644 --- a/modules/nettokom/browser.py +++ b/modules/nettokom/browser.py @@ -18,13 +18,13 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import HomePage, LoginPage, HistoryPage, DetailsPage, BillsPage __all__ = ['Nettokom'] -class Nettokom(BaseBrowser): +class Nettokom(Browser): DOMAIN = 'konto.nettokom.de' PROTOCOL = 'https' ENCODING = None # refer to the HTML encoding @@ -36,7 +36,7 @@ class Nettokom(BaseBrowser): } def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): self.location('/start.html') diff --git a/modules/nihonnooto/browser.py b/modules/nihonnooto/browser.py index abe5df43d3..f67cb6ec63 100644 --- a/modules/nihonnooto/browser.py +++ b/modules/nihonnooto/browser.py @@ -17,16 +17,16 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import LivePage, ProgramPage __all__ = ['NihonNoOtoBrowser'] -class NihonNoOtoBrowser(BaseBrowser): +class NihonNoOtoBrowser(Browser): DOMAIN = 'www.nihon-no-oto.com' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['desktop_firefox'] + USER_AGENT = Browser.USER_AGENTS['desktop_firefox'] PAGES = { 'http://www\.nihon-no-oto\.com/': LivePage, 'http://www\.nihon-no-oto\.com/app/playlist.php': ProgramPage, diff --git a/modules/nolifetv/browser.py b/modules/nolifetv/browser.py index 26752efb3f..83d6ebc512 100644 --- a/modules/nolifetv/browser.py +++ b/modules/nolifetv/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword import urllib @@ -28,8 +28,8 @@ __all__ = ['NolifeTVBrowser'] -class NolifeTVBrowser(BaseBrowser): - USER_AGENT = BaseBrowser.USER_AGENTS['desktop_firefox'] +class NolifeTVBrowser(Browser): + USER_AGENT = Browser.USER_AGENTS['desktop_firefox'] DOMAIN = 'mobile.nolife-tv.com' PROTOCOL = 'http' PAGES = { r'http://mobile.nolife-tv.com/online/familles-\w+/': FamilyPage, diff --git a/modules/okc/browser.py b/modules/okc/browser.py index eee1447808..be5e8043d9 100644 --- a/modules/okc/browser.py +++ b/modules/okc/browser.py @@ -19,7 +19,7 @@ import urllib -from weboob.tools.browser import BaseBrowser, Page +from weboob.tools.browser import Browser, Page from weboob.tools.ordereddict import OrderedDict from .pages import LoginPage, ThreadPage, MessagesPage, PostMessagePage, ProfilePage, PhotosPage, VisitsPage, QuickMatchPage, SentPage @@ -39,7 +39,7 @@ def inner(self, *args, **kwargs): return inner -class OkCBrowser(BaseBrowser): +class OkCBrowser(Browser): DOMAIN = 'm.okcupid.com' PROTOCOL = 'https' ENCODING = 'UTF-8' diff --git a/modules/opacwebaloes/browser.py b/modules/opacwebaloes/browser.py index 79698fab23..a65b19bc8f 100644 --- a/modules/opacwebaloes/browser.py +++ b/modules/opacwebaloes/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, HomePage, RentedPage, HistoryPage, BookedPage @@ -27,10 +27,10 @@ # Browser -class AloesBrowser(BaseBrowser): +class AloesBrowser(Browser): PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['desktop_firefox'] + USER_AGENT = Browser.USER_AGENTS['desktop_firefox'] #DEBUG_HTTP = True DEBUG_HTTP = False PAGES = { @@ -43,7 +43,7 @@ class AloesBrowser(BaseBrowser): def __init__(self, baseurl, *args, **kwargs): self.BASEURL = baseurl - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def is_logged(self): diff --git a/modules/opensubtitles/browser.py b/modules/opensubtitles/browser.py index 501daec1fc..d82c4a4565 100644 --- a/modules/opensubtitles/browser.py +++ b/modules/opensubtitles/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from weboob.applications.suboob.suboob import LANGUAGE_CONV from .pages import SubtitlesPage, SearchPage, SubtitlePage @@ -27,11 +27,11 @@ __all__ = ['OpensubtitlesBrowser'] -class OpensubtitlesBrowser(BaseBrowser): +class OpensubtitlesBrowser(Browser): DOMAIN = 'www.opensubtitles.org' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.opensubtitles.org.*search2/sublanguageid.*moviename.*': SearchPage, 'http://www.opensubtitles.org.*search/sublanguageid.*idmovie.*': SubtitlesPage, diff --git a/modules/orange/browser.py b/modules/orange/browser.py index a9ea84bdc5..579743a37b 100644 --- a/modules/orange/browser.py +++ b/modules/orange/browser.py @@ -23,13 +23,13 @@ from .pages import LoginPage, ComposePage, ConfirmPage -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword __all__ = ['OrangeBrowser'] -class OrangeBrowser(BaseBrowser): +class OrangeBrowser(Browser): DOMAIN = 'orange.fr' PAGES = { 'http://id.orange.fr/auth_user/bin/auth_user.cgi.*': LoginPage, diff --git a/modules/ovs/browser.py b/modules/ovs/browser.py index 7181af3c2e..1e62ea1d83 100644 --- a/modules/ovs/browser.py +++ b/modules/ovs/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.tools.parsers.iparser import IParser import BeautifulSoup @@ -33,7 +33,7 @@ def parse(self, data, encoding=None): return BeautifulSoup.BeautifulSoup(data.read().decode(encoding or 'utf-8'), convertEntities=BeautifulSoup.BeautifulStoneSoup.ALL_ENTITIES) -class OvsBrowser(BaseBrowser): +class OvsBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'paris.onvasortir.com' ENCODING = 'cp1252' @@ -62,7 +62,7 @@ def __init__(self, city, username, password, *a, **kw): } kw['parser'] = SoupParser() - BaseBrowser.__init__(self, username, password, *a, **kw) + Browser.__init__(self, username, password, *a, **kw) self.city = city def iter_threads_list(self): diff --git a/modules/pap/browser.py b/modules/pap/browser.py index c2ba06cc1a..21d7332e36 100644 --- a/modules/pap/browser.py +++ b/modules/pap/browser.py @@ -22,7 +22,7 @@ from weboob.tools.json import json -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.capabilities.housing import Query from .pages import SearchResultsPage, HousingPage @@ -31,7 +31,7 @@ __all__ = ['PapBrowser'] -class PapBrowser(BaseBrowser): +class PapBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.pap.fr' ENCODING = 'utf-8' diff --git a/modules/pariskiwi/browser.py b/modules/pariskiwi/browser.py index e9d4dfe825..21b5f35fbf 100644 --- a/modules/pariskiwi/browser.py +++ b/modules/pariskiwi/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import PageList, PageList2, PageEvent @@ -26,7 +26,7 @@ __all__ = ['ParisKiwiBrowser'] -class ParisKiwiBrowser(BaseBrowser): +class ParisKiwiBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'pariskiwi.org' ENCODING = 'utf-8' @@ -39,7 +39,7 @@ class ParisKiwiBrowser(BaseBrowser): def __init__(self, *a, **kw): kw['parser'] = 'raw' - BaseBrowser.__init__(self, *a, **kw) + Browser.__init__(self, *a, **kw) def list_events_all(self): self.location('http://pariskiwi.org/~parislagrise/mediawiki/api.php?action=query&list=allpages&apprefix=Agenda%2FDetruire_Ennui_Paris&aplimit=500&format=json') diff --git a/modules/parolesmania/browser.py b/modules/parolesmania/browser.py index 5c7adcf449..066bf707b6 100644 --- a/modules/parolesmania/browser.py +++ b/modules/parolesmania/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import SongResultsPage, SonglyricsPage, ArtistResultsPage, ArtistSongsPage @@ -26,11 +26,11 @@ __all__ = ['ParolesmaniaBrowser'] -class ParolesmaniaBrowser(BaseBrowser): +class ParolesmaniaBrowser(Browser): DOMAIN = 'www.parolesmania.com' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.parolesmania.com/recherche.php\?c=title.*': SongResultsPage, 'http://www.parolesmania.com/recherche.php\?c=artist.*': ArtistResultsPage, diff --git a/modules/parolesmusique/browser.py b/modules/parolesmusique/browser.py index b4a825c8d4..e8b237262c 100644 --- a/modules/parolesmusique/browser.py +++ b/modules/parolesmusique/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import SongResultsPage, SonglyricsPage, ArtistResultsPage, ArtistSongsPage, HomePage @@ -26,11 +26,11 @@ __all__ = ['ParolesmusiqueBrowser'] -class ParolesmusiqueBrowser(BaseBrowser): +class ParolesmusiqueBrowser(Browser): DOMAIN = 'www.paroles-musique.com' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.paroles-musique.com': HomePage, 'http://www.paroles-musique.com/lyrics-paroles-0-.*,0.php': SongResultsPage, diff --git a/modules/parolesnet/browser.py b/modules/parolesnet/browser.py index 4401220000..a5db5e58b5 100644 --- a/modules/parolesnet/browser.py +++ b/modules/parolesnet/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import ResultsPage, SonglyricsPage, ArtistSongsPage, HomePage @@ -26,11 +26,11 @@ __all__ = ['ParolesnetBrowser'] -class ParolesnetBrowser(BaseBrowser): +class ParolesnetBrowser(Browser): DOMAIN = 'www.paroles.net' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.paroles.net': HomePage, 'http://www.paroles.net/search': ResultsPage, diff --git a/modules/paypal/browser.py b/modules/paypal/browser.py index ae1262c555..333fff5a28 100644 --- a/modules/paypal/browser.py +++ b/modules/paypal/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages import LoginPage, AccountPage, DownloadHistoryPage, LastDownloadHistoryPage, SubmitPage, HistoryParser, UselessPage, HistoryPage, CSVAlreadyAsked import datetime @@ -26,7 +26,7 @@ __all__ = ['Paypal'] -class Paypal(BaseBrowser): +class Paypal(Browser): DOMAIN = 'www.paypal.com' PROTOCOL = 'https' CERTHASH = ['b8f6c76050ed3035aab08474b1da0ff783f20d114b1740e8db275fe433ff69af', '96753399cf183334cef00a72719ea8e13cfe68d1e953006348f41f884180de15'] diff --git a/modules/phpbb/browser.py b/modules/phpbb/browser.py index 4baf9ee737..9117d148a3 100644 --- a/modules/phpbb/browser.py +++ b/modules/phpbb/browser.py @@ -22,7 +22,7 @@ import urllib from urlparse import urlsplit -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.capabilities.messages import CantSendMessage from .pages.index import LoginPage @@ -34,7 +34,7 @@ # Browser -class PhpBB(BaseBrowser): +class PhpBB(Browser): PAGES = {'https?://.*/index.php': ForumPage, 'https?://.*/': ForumPage, 'https?://.*/viewforum.php\?f=(\d+)': ForumPage, @@ -52,10 +52,10 @@ def __init__(self, url, *args, **kwargs): self.PROTOCOL = v.scheme self.DOMAIN = v.netloc self.BASEPATH = v.path[:v.path.rfind('/')] - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def absurl(self, rel): - return BaseBrowser.absurl(self, '%s/%s' % (self.BASEPATH, rel)) + return Browser.absurl(self, '%s/%s' % (self.BASEPATH, rel)) def home(self): self.location(self.url) diff --git a/modules/piratebay/browser.py b/modules/piratebay/browser.py index f45ff5bf53..48e85ab28e 100644 --- a/modules/piratebay/browser.py +++ b/modules/piratebay/browser.py @@ -21,7 +21,7 @@ from urlparse import urlsplit import urllib -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages.index import IndexPage from .pages.torrents import TorrentsPage, TorrentPage @@ -30,7 +30,7 @@ __all__ = ['PiratebayBrowser'] -class PiratebayBrowser(BaseBrowser): +class PiratebayBrowser(Browser): ENCODING = 'utf-8' def __init__(self, url, *args, **kwargs): @@ -43,7 +43,7 @@ def __init__(self, url, *args, **kwargs): '%s://%s/search/.*/0/7/0' % (self.PROTOCOL, self.DOMAIN): TorrentsPage, '%s://%s/torrent/.*' % (self.PROTOCOL, self.DOMAIN): TorrentPage } - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def iter_torrents(self, pattern): self.location('%s://%s/search/%s/0/7/0' % (self.PROTOCOL, diff --git a/modules/pixtoilelibre/browser.py b/modules/pixtoilelibre/browser.py index 687e377dc0..ef9d5c85a3 100644 --- a/modules/pixtoilelibre/browser.py +++ b/modules/pixtoilelibre/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.capabilities.paste import image_mime from StringIO import StringIO @@ -28,7 +28,7 @@ __all__ = ['PixtoilelibreBrowser'] -class PixtoilelibreBrowser(BaseBrowser): +class PixtoilelibreBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'pix.toile-libre.org' ENCODING = None diff --git a/modules/podnapisi/browser.py b/modules/podnapisi/browser.py index 9a18152d64..29eed57d8c 100644 --- a/modules/podnapisi/browser.py +++ b/modules/podnapisi/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import SearchPage, SubtitlePage, LANGUAGE_NUMBERS @@ -26,11 +26,11 @@ __all__ = ['PodnapisiBrowser'] -class PodnapisiBrowser(BaseBrowser): +class PodnapisiBrowser(Browser): DOMAIN = 'www.podnapisi.net' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.podnapisi.net/fr/ppodnapisi/search\?sJ=[0-9]*&sK=.*&sS=downloads&sO=desc': SearchPage, 'http://www.podnapisi.net/fr/ppodnapisi/podnapis/i/[0-9]*': SubtitlePage diff --git a/modules/popolemploi/browser.py b/modules/popolemploi/browser.py index 50f7a6f4ae..dc9cad25a2 100644 --- a/modules/popolemploi/browser.py +++ b/modules/popolemploi/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.tools.browser.decorators import id2url -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser import urllib from .pages import SearchPage, AdvertPage @@ -28,7 +28,7 @@ __all__ = ['PopolemploiBrowser'] -class PopolemploiBrowser(BaseBrowser): +class PopolemploiBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'http://www.pole-emploi.fr/accueil/' ENCODING = None diff --git a/modules/presseurop/browser.py b/modules/presseurop/browser.py index 14cb6646ac..3f57f69832 100644 --- a/modules/presseurop/browser.py +++ b/modules/presseurop/browser.py @@ -21,11 +21,11 @@ from datetime import date, datetime, time from .pages.article import PresseuropPage, CartoonPage, DailySinglePage,\ DailyTitlesPage -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.ordereddict import OrderedDict -class NewspaperPresseuropBrowser(BaseBrowser): +class NewspaperPresseuropBrowser(Browser): "NewspaperPresseuropBrowser class" PAGES = OrderedDict(( ("http://www.voxeurop.eu/.*/news-brief/.*", DailySinglePage), diff --git a/modules/prixcarburants/browser.py b/modules/prixcarburants/browser.py index 3321353465..32ea765822 100644 --- a/modules/prixcarburants/browser.py +++ b/modules/prixcarburants/browser.py @@ -20,7 +20,7 @@ import urllib -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import IndexPage, ComparisonResultsPage, ShopInfoPage @@ -28,7 +28,7 @@ __all__ = ['PrixCarburantsBrowser'] -class PrixCarburantsBrowser(BaseBrowser): +class PrixCarburantsBrowser(Browser): TOKEN = None PROTOCOL = 'http' DOMAIN = 'www.prix-carburants.economie.gouv.fr' diff --git a/modules/radiofrance/browser.py b/modules/radiofrance/browser.py index d765cbc125..12e59145b8 100644 --- a/modules/radiofrance/browser.py +++ b/modules/radiofrance/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, Page +from weboob.tools.browser import Browser, Page from weboob.tools.json import json from weboob.capabilities.video import BaseVideo from weboob.tools.browser.decorators import id2url @@ -121,7 +121,7 @@ def get_title(self): return ' '.join(titles) -class RadioFranceBrowser(BaseBrowser): +class RadioFranceBrowser(Browser): DOMAIN = None ENCODING = 'UTF-8' PAGES = {r'http://.*/player/direct': DataPage, diff --git a/modules/redmine/browser.py b/modules/redmine/browser.py index 316cbf8b71..7a4e5fd291 100644 --- a/modules/redmine/browser.py +++ b/modules/redmine/browser.py @@ -24,7 +24,7 @@ import lxml.html from weboob.capabilities.bugtracker import IssueError -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from .pages.index import LoginPage, IndexPage, MyPage, ProjectsPage from .pages.wiki import WikiPage, WikiEditPage @@ -36,7 +36,7 @@ # Browser -class RedmineBrowser(BaseBrowser): +class RedmineBrowser(Browser): ENCODING = 'utf-8' PAGES = { 'https?://[^/]+/': IndexPage, @@ -63,7 +63,7 @@ def __init__(self, url, *args, **kwargs): self.BASEPATH = v.path if self.BASEPATH.endswith('/'): self.BASEPATH = self.BASEPATH[:-1] - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) self.projects = {} def is_logged(self): diff --git a/modules/seeklyrics/browser.py b/modules/seeklyrics/browser.py index 79f6b126d6..602948486b 100644 --- a/modules/seeklyrics/browser.py +++ b/modules/seeklyrics/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import SongResultsPage, SonglyricsPage, ArtistResultsPage, ArtistSongsPage @@ -26,11 +26,11 @@ __all__ = ['SeeklyricsBrowser'] -class SeeklyricsBrowser(BaseBrowser): +class SeeklyricsBrowser(Browser): DOMAIN = 'www.seeklyrics.com' PROTOCOL = 'http' ENCODING = 'iso-8859-1' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.seeklyrics.com/search.php.*t=1': SongResultsPage, 'http://www.seeklyrics.com/search.php.*t=2': ArtistResultsPage, diff --git a/modules/seloger/browser.py b/modules/seloger/browser.py index 1d069c5e50..ba38b2a6bc 100644 --- a/modules/seloger/browser.py +++ b/modules/seloger/browser.py @@ -20,7 +20,7 @@ from weboob.tools.json import json -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.capabilities.housing import Query from .pages import SearchResultsPage, HousingPage @@ -29,11 +29,11 @@ __all__ = ['SeLogerBrowser'] -class SeLogerBrowser(BaseBrowser): +class SeLogerBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.seloger.com' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['android'] + USER_AGENT = Browser.USER_AGENTS['android'] PAGES = { 'http://ws.seloger.com/search.xml.*': SearchResultsPage, 'http://ws.seloger.com/annonceDetail.xml\?idAnnonce=(\d+)(&noAudiotel=\d)?': HousingPage, diff --git a/modules/sfr/browser.py b/modules/sfr/browser.py index dadac860ed..ef74183e34 100644 --- a/modules/sfr/browser.py +++ b/modules/sfr/browser.py @@ -23,13 +23,13 @@ from .pages.compose import ClosePage, ComposePage, ConfirmPage, SentPage from .pages.login import LoginPage -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword __all__ = ['SfrBrowser'] -class SfrBrowser(BaseBrowser): +class SfrBrowser(Browser): DOMAIN = 'www.sfr.fr' PAGES = { 'http://messagerie-.+.sfr.fr/webmail/close_xms_tab.html': ClosePage, diff --git a/modules/societegenerale/browser.py b/modules/societegenerale/browser.py index 547f80cf85..ec947f828f 100644 --- a/modules/societegenerale/browser.py +++ b/modules/societegenerale/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrowserUnavailable +from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrowserUnavailable from .pages.accounts_list import AccountsList, AccountHistory, CardsList from .pages.login import LoginPage, BadLoginPage @@ -27,7 +27,7 @@ __all__ = ['SocieteGenerale'] -class SocieteGenerale(BaseBrowser): +class SocieteGenerale(Browser): DOMAIN_LOGIN = 'particuliers.societegenerale.fr' CERTHASH_LOGIN = ['629873f98004aef6c42d15714ff9689fdfce04746483122417f432cd693f5007'] DOMAIN = 'particuliers.secure.societegenerale.fr' @@ -46,7 +46,7 @@ class SocieteGenerale(BaseBrowser): def __init__(self, *args, **kwargs): self.lowsslcheck(self.DOMAIN_LOGIN, self.CERTHASH_LOGIN) - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def home(self): self.location('https://' + self.DOMAIN_LOGIN + '/index.html') diff --git a/modules/societegenerale/sgpe/browser.py b/modules/societegenerale/sgpe/browser.py index 5ae39c0319..6963aebdaf 100644 --- a/modules/societegenerale/sgpe/browser.py +++ b/modules/societegenerale/sgpe/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import Browser, BrowserIncorrectPassword from weboob.tools.ordereddict import OrderedDict from .pages import LoginPage, ErrorPage, AccountsPage, CardsPage, HistoryPage, CardHistoryPage @@ -27,7 +27,7 @@ __all__ = ['SGProfessionalBrowser', 'SGEnterpriseBrowser'] -class SGPEBrowser(BaseBrowser): +class SGPEBrowser(Browser): PROTOCOL = 'https' ENCODING = 'ISO-8859-1' @@ -40,7 +40,7 @@ def __init__(self, *args, **kwargs): ('%s://%s/authent\.html' % (self.PROTOCOL, self.DOMAIN), ErrorPage), ('%s://%s/' % (self.PROTOCOL, self.DOMAIN), LoginPage), )) - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def is_logged(self): if not self.page or self.is_on_page(LoginPage): diff --git a/modules/sueurdemetal/browser.py b/modules/sueurdemetal/browser.py index ec7f292191..42c5ec1799 100644 --- a/modules/sueurdemetal/browser.py +++ b/modules/sueurdemetal/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import PageCity, PageConcert, PageCityList, PageDate, PageDates @@ -26,7 +26,7 @@ __all__ = ['SueurDeMetalBrowser'] -class SueurDeMetalBrowser(BaseBrowser): +class SueurDeMetalBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.sueurdemetal.com' ENCODING = 'iso-8859-15' diff --git a/modules/supertoinette/browser.py b/modules/supertoinette/browser.py index cc38373497..10c8614d6b 100644 --- a/modules/supertoinette/browser.py +++ b/modules/supertoinette/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import RecipePage, ResultsPage @@ -26,11 +26,11 @@ __all__ = ['SupertoinetteBrowser'] -class SupertoinetteBrowser(BaseBrowser): +class SupertoinetteBrowser(Browser): DOMAIN = 'www.supertoinette.com' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['desktop_firefox'] + USER_AGENT = Browser.USER_AGENTS['desktop_firefox'] PAGES = { 'http://www.supertoinette.com/liste-recettes/.*': ResultsPage, 'http://www.supertoinette.com/recette/[0-9]*.*': RecipePage, diff --git a/modules/taz/browser.py b/modules/taz/browser.py index b7bdb1e74b..ea1009d366 100644 --- a/modules/taz/browser.py +++ b/modules/taz/browser.py @@ -19,10 +19,10 @@ # along with weboob. If not, see . from .pages.article import ArticlePage -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser -class NewspaperTazBrowser(BaseBrowser): +class NewspaperTazBrowser(Browser): "NewspaperTazBrowser class" PAGES = { "http://www.taz.de/.*": ArticlePage, diff --git a/modules/trictractv/browser.py b/modules/trictractv/browser.py index b7ba8a30f4..b498dd6610 100644 --- a/modules/trictractv/browser.py +++ b/modules/trictractv/browser.py @@ -19,7 +19,7 @@ import re -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.browser.decorators import id2url from .pages import IndexPage, VideoPage @@ -29,7 +29,7 @@ __all__ = ['TricTracTVBrowser'] -class TricTracTVBrowser(BaseBrowser): +class TricTracTVBrowser(Browser): DOMAIN = 'trictrac.tv' ENCODING = 'ISO-8859-1' PAGES = {r'http://[w\.]*trictrac.tv/': IndexPage, diff --git a/modules/tvsubtitles/browser.py b/modules/tvsubtitles/browser.py index 078f4c4061..de4f3650b3 100644 --- a/modules/tvsubtitles/browser.py +++ b/modules/tvsubtitles/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound +from weboob.tools.browser import Browser, BrowserHTTPNotFound from .pages import SeriePage, SearchPage, SeasonPage, HomePage @@ -30,11 +30,11 @@ 'ko', 'cn', 'jp', 'bg', 'cz', 'ro'] -class TvsubtitlesBrowser(BaseBrowser): +class TvsubtitlesBrowser(Browser): DOMAIN = 'www.tvsubtitles.net' PROTOCOL = 'http' ENCODING = 'utf-8' - USER_AGENT = BaseBrowser.USER_AGENTS['wget'] + USER_AGENT = Browser.USER_AGENTS['wget'] PAGES = { 'http://www.tvsubtitles.net': HomePage, 'http://www.tvsubtitles.net/search.php': SearchPage, diff --git a/modules/unsee/browser.py b/modules/unsee/browser.py index cacebd116c..b1ed77daf3 100644 --- a/modules/unsee/browser.py +++ b/modules/unsee/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser import os from uuid import uuid4 from urllib2 import Request @@ -46,7 +46,7 @@ def __init__(self, filename, contents=None, headers=None): self.contents = open(filename).read() -class UnseeBrowser(BaseBrowser): +class UnseeBrowser(Browser): PROTOCOL = 'https' DOMAIN = 'unsee.cc' ENCODING = 'utf-8' diff --git a/modules/ups/browser.py b/modules/ups/browser.py index 752159b981..c80f7d5996 100644 --- a/modules/ups/browser.py +++ b/modules/ups/browser.py @@ -19,7 +19,7 @@ import urllib -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import TrackPage @@ -27,7 +27,7 @@ __all__ = ['UpsBrowser'] -class UpsBrowser(BaseBrowser): +class UpsBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'wwwapps.ups.com' ENCODING = None diff --git a/modules/voyagessncf/browser.py b/modules/voyagessncf/browser.py index 838240f769..3a75590eb8 100644 --- a/modules/voyagessncf/browser.py +++ b/modules/voyagessncf/browser.py @@ -19,7 +19,7 @@ from random import randint -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import CitiesPage, SearchPage, SearchErrorPage, \ SearchInProgressPage, ResultsPage, ForeignPage @@ -28,7 +28,7 @@ __all__ = ['VoyagesSNCFBrowser'] -class VoyagesSNCFBrowser(BaseBrowser): +class VoyagesSNCFBrowser(Browser): PROTOCOL = 'http' DOMAIN = 'www.voyages-sncf.com' ENCODING = 'utf-8' @@ -43,7 +43,7 @@ class VoyagesSNCFBrowser(BaseBrowser): } def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) self.addheaders += (('X-Forwarded-For', '82.228.147.%s' % randint(1,254)),) diff --git a/modules/weather/browser.py b/modules/weather/browser.py index d70b465d29..96a2befae7 100644 --- a/modules/weather/browser.py +++ b/modules/weather/browser.py @@ -20,14 +20,14 @@ import urllib -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import ForecastPage, WeatherPage, CityPage __all__ = ['WeatherBrowser'] -class WeatherBrowser(BaseBrowser): +class WeatherBrowser(Browser): DOMAIN = 'www.weather.com' PROTOCOL = 'http' ENCODING = 'utf-8' @@ -37,7 +37,7 @@ class WeatherBrowser(BaseBrowser): WEATHER_URL = 'http://www.weather.com/weather/today/%s' FORECAST_URL = 'http://www.weather.com/weather/tenday/%s' RIGHTNOW_URL = 'http://www.weather.com/weather/right-now/%s' - USER_AGENT = BaseBrowser.USER_AGENTS['desktop_firefox'] + USER_AGENT = Browser.USER_AGENTS['desktop_firefox'] PAGES = { (SEARCH_URL.replace('.', '\\.').replace('?', '\\?') % '.*'): CityPage, diff --git a/modules/wordreference/browser.py b/modules/wordreference/browser.py index 7cefe5ff94..5e4813e4c4 100644 --- a/modules/wordreference/browser.py +++ b/modules/wordreference/browser.py @@ -20,7 +20,7 @@ import urllib -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import TranslatePage @@ -28,16 +28,16 @@ __all__ = ['WordReferenceBrowser'] -class WordReferenceBrowser(BaseBrowser): +class WordReferenceBrowser(Browser): DOMAIN = 'www.wordreference.com' ENCODING = 'UTF-8' - USER_AGENT = BaseBrowser.USER_AGENTS['desktop_firefox'] + USER_AGENT = Browser.USER_AGENTS['desktop_firefox'] PAGES = { 'https?://www\.wordreference\.com/.*/.*': TranslatePage } def __init__(self, *args, **kwargs): - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def translate(self, source, to, text): """ diff --git a/modules/youporn/browser.py b/modules/youporn/browser.py index a864c38c1f..1f00eb3bb7 100644 --- a/modules/youporn/browser.py +++ b/modules/youporn/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from weboob.tools.browser.decorators import id2url from .pages.index import IndexPage @@ -29,7 +29,7 @@ __all__ = ['YoupornBrowser'] -class YoupornBrowser(BaseBrowser): +class YoupornBrowser(Browser): DOMAIN = 'www.youporn.com' ENCODING = None PAGES = {r'http://[w\.]*youporn\.com/?': IndexPage, diff --git a/modules/youtube/browser.py b/modules/youtube/browser.py index 5aaa2963d1..e4f6f6ed72 100644 --- a/modules/youtube/browser.py +++ b/modules/youtube/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser +from weboob.tools.browser import Browser from .pages import BaseYoutubePage, VideoPage, ForbiddenVideoPage, \ VerifyAgePage, VerifyControversyPage, \ @@ -28,7 +28,7 @@ __all__ = ['YoutubeBrowser'] -class YoutubeBrowser(BaseBrowser): +class YoutubeBrowser(Browser): DOMAIN = u'youtube.com' ENCODING = 'utf-8' PAGES = {r'https?://.*youtube\.com/': BaseYoutubePage, diff --git a/weboob/core/repositories.py b/weboob/core/repositories.py index 06fa8144c4..70af64c6d2 100644 --- a/weboob/core/repositories.py +++ b/weboob/core/repositories.py @@ -442,8 +442,8 @@ def __init__(self, workdir, datadir, version): self.load() def load_browser(self): - from weboob.tools.browser2.browser import BaseBrowser, Weboob as WeboobProfile - class WeboobBrowser(BaseBrowser): + from weboob.tools.browser2.browser import Browser, Weboob as WeboobProfile + class WeboobBrowser(Browser): PROFILE = WeboobProfile(self.version) if self.browser is None: self.browser = WeboobBrowser() diff --git a/weboob/tools/browser/__init__.py b/weboob/tools/browser/__init__.py index 2d2917cf71..e312226913 100644 --- a/weboob/tools/browser/__init__.py +++ b/weboob/tools/browser/__init__.py @@ -21,11 +21,11 @@ from weboob.tools.browser.browser import BrowserIncorrectPassword, BrowserBanned, \ BrowserUnavailable, BrowserRetry, \ BrowserHTTPNotFound, BrowserHTTPError, \ - Page, BaseBrowser, BrokenPageError, \ + Page, Browser, BrokenPageError, \ StandardBrowser, BrowserPasswordExpired, \ BrowserForbidden __all__ = ['BrowserIncorrectPassword', 'BrowserPasswordExpired', 'BrowserBanned', 'BrowserUnavailable', 'BrowserRetry', 'BrowserHTTPNotFound', 'BrowserHTTPError', - 'Page', 'BaseBrowser', 'BrokenPageError', 'StandardBrowser', 'BrowserForbidden'] + 'Page', 'Browser', 'BrokenPageError', 'StandardBrowser', 'BrowserForbidden'] diff --git a/weboob/tools/browser/browser.py b/weboob/tools/browser/browser.py index 7c6a030a02..b353f24506 100644 --- a/weboob/tools/browser/browser.py +++ b/weboob/tools/browser/browser.py @@ -58,7 +58,7 @@ __all__ = ['BrowserIncorrectPassword', 'BrowserForbidden', 'BrowserBanned', 'BrowserUnavailable', 'BrowserRetry', 'BrowserPasswordExpired', 'BrowserHTTPNotFound', 'BrowserHTTPError', 'BrokenPageError', 'Page', - 'StandardBrowser', 'BaseBrowser'] + 'StandardBrowser', 'Browser'] class BrowserRetry(Exception): @@ -422,7 +422,7 @@ def __setitem__(self, key, value): -class BaseBrowser(StandardBrowser): +class Browser(StandardBrowser): """ Base browser class to navigate on a website. diff --git a/weboob/tools/browser2/__init__.py b/weboob/tools/browser2/__init__.py index c231bc6a90..cfa754bc19 100644 --- a/weboob/tools/browser2/__init__.py +++ b/weboob/tools/browser2/__init__.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from .browser import BaseBrowser, DomainBrowser, Wget, Firefox, UrlNotAllowed, Profile +from .browser import Browser, DomainBrowser, Wget, Firefox, UrlNotAllowed, Profile from .page import PagesBrowser, Page, URL, HTMLPage, LoginBrowser, need_login, JsonPage, LoggedPage, XMLPage -__all__ = ['BaseBrowser', 'DomainBrowser', 'Wget', 'Firefox', 'UrlNotAllowed', 'Profile', 'XMLPage', +__all__ = ['Browser', 'DomainBrowser', 'Wget', 'Firefox', 'UrlNotAllowed', 'Profile', 'XMLPage', 'PagesBrowser', 'Page', 'URL', 'HTMLPage', 'LoginBrowser', 'need_login', 'JsonPage', 'LoggedPage'] diff --git a/weboob/tools/browser2/browser.py b/weboob/tools/browser2/browser.py index 120d9a5935..80502b6b95 100644 --- a/weboob/tools/browser2/browser.py +++ b/weboob/tools/browser2/browser.py @@ -116,7 +116,7 @@ def setup_session(self, session): 'User-Agent': 'Wget/%s' % self.version}) -class BaseBrowser(object): +class Browser(object): """ Simple browser class. Act like a browser, and don't try to do too much. @@ -295,7 +295,7 @@ def open(self, url, referrer=None, For example: - >>> BaseBrowser().open('http://google.com', async=True).result().text # doctest: +SKIP + >>> Browser().open('http://google.com', async=True).result().text # doctest: +SKIP :param url: URL :type url: str @@ -496,7 +496,7 @@ class UrlNotAllowed(Exception): """ -class DomainBrowser(BaseBrowser): +class DomainBrowser(Browser): """ A browser that handles relative URLs and can have a base URL (usually a domain). @@ -559,7 +559,7 @@ def absurl(self, uri, base=None): def open(self, req, *args, **kwargs): """ - Like :meth:`BaseBrowser.open` but hanldes urls without domains, using + Like :meth:`Browser.open` but hanldes urls without domains, using the :attr:`BASEURL` attribute. """ uri = req.url if isinstance(req, requests.Request) else req diff --git a/weboob/tools/browser2/page.py b/weboob/tools/browser2/page.py index 2e0cb5fc96..cbc671de8d 100644 --- a/weboob/tools/browser2/page.py +++ b/weboob/tools/browser2/page.py @@ -287,7 +287,7 @@ def open(self, *args, **kwargs): callback = kwargs.pop('callback', lambda response: response) # Have to define a callback to seamlessly process synchronous and - # asynchronous requests, see :meth:`BaseBrowser.open` and its `async` + # asynchronous requests, see :meth:`Browser.open` and its `async` # and `callback` params. def internal_callback(response): # Try to handle the response page with an URL instance. @@ -309,7 +309,7 @@ def internal_callback(response): def location(self, *args, **kwargs): """ Same method than - :meth:`weboob.tools.browser2.browser.BaseBrowser.location`, but if the + :meth:`weboob.tools.browser2.browser.Browser.location`, but if the url matches any :class:`URL` object, an attribute `page` is added to response, and the attribute :attr:`PagesBrowser.page` is set. """ diff --git a/weboob/tools/capabilities/gallery/genericcomicreader.py b/weboob/tools/capabilities/gallery/genericcomicreader.py index c9763fcab3..a5d8de85e0 100644 --- a/weboob/tools/capabilities/gallery/genericcomicreader.py +++ b/weboob/tools/capabilities/gallery/genericcomicreader.py @@ -23,7 +23,7 @@ from weboob.capabilities.gallery import CapGallery, BaseGallery, BaseImage from weboob.tools.backend import Module -from weboob.tools.browser import BaseBrowser, Page +from weboob.tools.browser import Browser, Page __all__ = ['GenericComicReaderModule'] @@ -40,10 +40,10 @@ def page_list(self): return self.document.xpath(self.browser.params['page_list_xpath']) -class GenericComicReaderBrowser(BaseBrowser): +class GenericComicReaderBrowser(Browser): def __init__(self, browser_params, *args, **kwargs): self.params = browser_params - BaseBrowser.__init__(self, *args, **kwargs) + Browser.__init__(self, *args, **kwargs) def iter_gallery_images(self, gallery): self.location(gallery.url) -- GitLab