From 5a1d83b5672f20b7a7303c84555dcc06bec88f92 Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 23 Sep 2014 10:16:35 +0200 Subject: [PATCH] Rename BaseModule to Module and Module to LoadedModule --- docs/source/guides/module.rst | 28 +++++++++---------- modules/750g/module.py | 4 +-- modules/adecco/module.py | 4 +-- modules/agendadulibre/module.py | 4 +-- modules/allocine/module.py | 4 +-- modules/alloresto/module.py | 4 +-- modules/allrecipes/module.py | 4 +-- modules/ameli/module.py | 4 +-- modules/amelipro/module.py | 4 +-- modules/americanexpress/module.py | 4 +-- modules/apec/module.py | 4 +-- modules/apivie/module.py | 4 +-- modules/arretsurimages/module.py | 4 +-- modules/arte/module.py | 4 +-- modules/attilasub/module.py | 4 +-- modules/audioaddict/module.py | 4 +-- modules/aum/module.py | 6 ++-- modules/axabanque/module.py | 4 +-- modules/banqueaccord/module.py | 4 +-- modules/banquepopulaire/module.py | 4 +-- modules/barclays/module.py | 4 +-- modules/biplan/module.py | 4 +-- modules/bnporc/module.py | 6 ++-- modules/boursorama/module.py | 4 +-- modules/bouygues/module.py | 4 +-- modules/bp/module.py | 4 +-- modules/bred/module.py | 4 +-- modules/btdigg/module.py | 4 +-- modules/btmon/module.py | 4 +-- modules/caissedepargne/module.py | 4 +-- modules/canalplus/module.py | 4 +-- modules/canaltp/module.py | 4 +-- modules/cappedtv/module.py | 4 +-- modules/carrefourbanque/module.py | 4 +-- modules/cci/module.py | 4 +-- modules/champslibres/module.py | 4 +-- modules/chronopost/module.py | 4 +-- modules/cic/module.py | 4 +-- modules/citelis/module.py | 4 +-- modules/cmb/module.py | 4 +-- modules/cmso/module.py | 4 +-- modules/colisprive/module.py | 4 +-- modules/colissimo/module.py | 4 +-- modules/cragr/module.py | 4 +-- modules/creditcooperatif/module.py | 4 +-- modules/creditdunord/module.py | 4 +-- modules/creditmutuel/module.py | 4 +-- modules/cuisineaz/module.py | 4 +-- modules/dailymotion/module.py | 4 +-- modules/delubac/module.py | 4 +-- modules/dlfp/module.py | 4 +-- modules/dresdenwetter/module.py | 4 +-- modules/ebonics/module.py | 4 +-- modules/edf/module.py | 4 +-- modules/ehentai/module.py | 4 +-- modules/europarl/module.py | 4 +-- modules/feedly/module.py | 4 +-- modules/fortuneo/module.py | 4 +-- modules/fourchan/module.py | 4 +-- modules/francetelevisions/module.py | 4 +-- modules/freemobile/module.py | 4 +-- modules/ganassurances/module.py | 4 +-- modules/gazelle/module.py | 4 +-- modules/gdcvault/module.py | 4 +-- modules/gdfsuez/module.py | 4 +-- modules/geolocip/module.py | 4 +-- modules/github/module.py | 4 +-- modules/googletranslate/module.py | 4 +-- modules/grooveshark/module.py | 4 +-- modules/groupamaes/module.py | 4 +-- modules/guerrillamail/module.py | 4 +-- modules/hds/module.py | 4 +-- modules/hellobank/module.py | 6 ++-- modules/hsbc/module.py | 4 +-- modules/hybride/module.py | 4 +-- modules/imdb/module.py | 4 +-- modules/imgur/module.py | 4 +-- modules/ina/module.py | 4 +-- modules/indeed/module.py | 4 +-- modules/ing/module.py | 4 +-- modules/ipinfodb/module.py | 4 +-- modules/izneo/module.py | 4 +-- modules/jacquieetmichel/module.py | 4 +-- modules/jcvelaux/module.py | 4 +-- modules/jvmalin/module.py | 4 +-- modules/kickass/module.py | 4 +-- modules/lacentrale/module.py | 4 +-- modules/lcl/module.py | 4 +-- modules/leclercmobile/module.py | 4 +-- modules/lolix/module.py | 4 +-- modules/lutim/module.py | 4 +-- modules/mailinator/module.py | 4 +-- modules/mareeinfo/module.py | 4 +-- modules/marmiton/module.py | 4 +-- modules/mediawiki/module.py | 4 +-- modules/meteofrance/module.py | 4 +-- modules/monster/module.py | 4 +-- modules/nectarine/module.py | 4 +-- modules/nettokom/module.py | 4 +-- modules/newsfeed/module.py | 4 +-- modules/nihonnooto/module.py | 4 +-- modules/nolifetv/module.py | 4 +-- modules/nova/module.py | 4 +-- modules/okc/module.py | 4 +-- modules/oney/module.py | 4 +-- modules/opacwebaloes/module.py | 4 +-- modules/opensubtitles/module.py | 4 +-- modules/orange/module.py | 4 +-- modules/ouifm/module.py | 4 +-- modules/ovs/module.py | 4 +-- modules/pap/module.py | 4 +-- modules/pariskiwi/module.py | 4 +-- modules/parolesmania/module.py | 4 +-- modules/parolesmusique/module.py | 4 +-- modules/parolesnet/module.py | 4 +-- modules/pastealacon/module.py | 4 +-- modules/pastebin/module.py | 4 +-- modules/paypal/module.py | 4 +-- modules/phpbb/module.py | 4 +-- modules/piratebay/module.py | 4 +-- modules/pixtoilelibre/module.py | 4 +-- modules/podnapisi/module.py | 4 +-- modules/poivy/module.py | 4 +-- modules/popolemploi/module.py | 4 +-- modules/prixcarburants/module.py | 4 +-- modules/quvi/module.py | 4 +-- modules/radiofrance/module.py | 4 +-- modules/razibus/module.py | 4 +-- modules/redmine/module.py | 4 +-- modules/regionsjob/module.py | 4 +-- modules/sachsen/module.py | 4 +-- modules/seeklyrics/module.py | 4 +-- modules/seloger/module.py | 4 +-- modules/senscritique/module.py | 4 +-- modules/sfr/module.py | 4 +-- modules/societegenerale/module.py | 4 +-- modules/somafm/module.py | 4 +-- modules/sueurdemetal/module.py | 4 +-- modules/supertoinette/module.py | 4 +-- modules/tinder/module.py | 4 +-- modules/transilien/module.py | 4 +-- modules/trictractv/module.py | 4 +-- modules/tvsubtitles/module.py | 4 +-- modules/twitter/module.py | 4 +-- modules/unsee/module.py | 4 +-- modules/ups/module.py | 4 +-- modules/vimeo/module.py | 4 +-- modules/vlille/module.py | 4 +-- modules/voyagessncf/module.py | 4 +-- modules/weather/module.py | 4 +-- modules/wellsfargo/module.py | 4 +-- modules/wordreference/module.py | 4 +-- modules/yahoo/module.py | 4 +-- modules/youjizz/module.py | 4 +-- modules/youporn/module.py | 4 +-- modules/youtube/module.py | 4 +-- tools/boilerplate_data/base_module.py | 4 +-- tools/boilerplate_data/cap_backend.py | 4 +-- weboob/capabilities/base.py | 2 +- weboob/core/bcall.py | 2 +- weboob/core/modules.py | 12 ++++---- weboob/core/ouiboube.py | 16 +++++------ weboob/core/repositories.py | 4 +-- weboob/tools/backend.py | 12 ++++---- .../gallery/genericcomicreader.py | 4 +-- .../capabilities/messages/GenericModule.py | 4 +-- 166 files changed, 359 insertions(+), 359 deletions(-) diff --git a/docs/source/guides/module.rst b/docs/source/guides/module.rst index 01b468d64c..87e9b3c6d9 100644 --- a/docs/source/guides/module.rst +++ b/docs/source/guides/module.rst @@ -63,8 +63,8 @@ For example, use this command:: In a module directory, there are commonly these files: -* **__init__.py** - needed in every python modules, it exports your :class:`BaseModule ` class. -* **module.py** - defines the main class of your module, which derives :class:`BaseModule `. +* **__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. * **pages.py** - all website's pages handled by the browser are defined here * **test.py** - functional tests @@ -97,9 +97,9 @@ If the last command does not work, check your :doc:`repositories setup ` class:: +Edit ``module.py``. It contains the main class of the module derived from :class:`Module ` class:: - class ExampleModule(BaseModule, CapBank): + class ExampleModule(Module, CapBank): NAME = 'example' # The name of module DESCRIPTION = u'Example bank website' # Description of your module MAINTAINER = u'John Smith' # Name of maintainer of this module @@ -138,7 +138,7 @@ For example:: from weboob.tools.backend import BackendConfig # ... - class ExampleModule(BaseModule, CapBank): + class ExampleModule(Module, CapBank): # ... CONFIG = BackendConfig(Value('username', label='Username', regexp='.+'), ValueBackendPassword('password', label='Password'), @@ -155,7 +155,7 @@ Implement capabilities You need to implement each method of all of the capabilities your module implements. For example, in our case:: # ... - class ExampleModule(BaseModule, CapBank): + class ExampleModule(Module, CapBank): # ... def iter_accounts(self): @@ -271,7 +271,7 @@ Now you have a functional browser, you can use it in your class ``ExampleModule` from .browser import ExampleBrowser # ... - class ExampleModule(BaseModule, CapBank): + class ExampleModule(Module, CapBank): # ... BROWSER = ExampleBrowser @@ -288,9 +288,9 @@ Login management ---------------- When the website requires to be authenticated, you have to give credentials to the constructor of the browser. You can redefine -the method :func:`create_default_browser `:: +the method :func:`create_default_browser `:: - class ExampleModule(BaseModule, CapBank): + class ExampleModule(Module, CapBank): # ... def create_default_browser(self): return self.create_browser(self.config['username'].get(), self.config['password'].get()) @@ -430,8 +430,8 @@ Filling objects An object returned by a method of a capability can be not fully completed. -The class :class:`BaseModule ` provides a method named -:func:`fillobj `, which can be called by an application to +The class :class:`Module ` provides a method named +:func:`fillobj `, which can be called by an application to fill some unloaded fields of a specific object, for example with:: backend.fillobj(video, ['url', 'author']) @@ -443,7 +443,7 @@ uncompleted fields, and call the method associated to the type of the object. To define what objects are supported to be filled, and what method to call, define the ``OBJECTS`` class attribute in your ``ExampleModule``:: - class ExampleModule(BaseModule, CapVideo): + class ExampleModule(Module, CapVideo): # ... OBJECTS = {Video: fill_video} @@ -454,7 +454,7 @@ The prototype of the function might be:: Then, the function might, for each requested fields, fetch the right data and fill the object. For example:: - class ExampleModule(BaseModule, CapVideo): + class ExampleModule(Module, CapVideo): # ... def fill_video(self, video, fields): @@ -477,7 +477,7 @@ The application can provide a storage to let your backend store data. So, you ca STORAGE = {'seen': {}} -To store and read data in your storage space, use the ``storage`` attribute of your :class:`BaseModule ` +To store and read data in your storage space, use the ``storage`` attribute of your :class:`Module ` object. It implements the methods of :class:`BackendStorage `. diff --git a/modules/750g/module.py b/modules/750g/module.py index 6a6d045db2..2e284fb6a6 100644 --- a/modules/750g/module.py +++ b/modules/750g/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import SevenFiftyGramsBrowser @@ -30,7 +30,7 @@ def strip_accents(s): __all__ = ['SevenFiftyGramsModule'] -class SevenFiftyGramsModule(BaseModule, CapRecipe): +class SevenFiftyGramsModule(Module, CapRecipe): NAME = '750g' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/adecco/module.py b/modules/adecco/module.py index 2687ed7462..8c463c73c5 100644 --- a/modules/adecco/module.py +++ b/modules/adecco/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value from weboob.capabilities.job import CapJob @@ -28,7 +28,7 @@ __all__ = ['AdeccoModule'] -class AdeccoModule(BaseModule, CapJob): +class AdeccoModule(Module, CapJob): NAME = 'adecco' DESCRIPTION = u'adecco website' MAINTAINER = u'Bezleputh' diff --git a/modules/agendadulibre/module.py b/modules/agendadulibre/module.py index f68f71aebf..565d97d42b 100644 --- a/modules/agendadulibre/module.py +++ b/modules/agendadulibre/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value @@ -29,7 +29,7 @@ __all__ = ['AgendadulibreModule'] -class AgendadulibreModule(BaseModule, CapCalendarEvent): +class AgendadulibreModule(Module, CapCalendarEvent): NAME = 'agendadulibre' DESCRIPTION = u'agendadulibre website' MAINTAINER = u'Bezleputh' diff --git a/modules/allocine/module.py b/modules/allocine/module.py index b816607252..6c32f178c0 100644 --- a/modules/allocine/module.py +++ b/modules/allocine/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.cinema import CapCinema, Person, Movie -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import AllocineBrowser @@ -27,7 +27,7 @@ __all__ = ['AllocineModule'] -class AllocineModule(BaseModule, CapCinema): +class AllocineModule(Module, CapCinema): NAME = 'allocine' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/alloresto/module.py b/modules/alloresto/module.py index 90583bc37c..89aae4ab9b 100644 --- a/modules/alloresto/module.py +++ b/modules/alloresto/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AlloRestoBrowser @@ -29,7 +29,7 @@ __all__ = ['AlloRestoModule'] -class AlloRestoModule(BaseModule, CapBank): +class AlloRestoModule(Module, CapBank): NAME = 'alloresto' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/allrecipes/module.py b/modules/allrecipes/module.py index d94317bafd..f97ca0d196 100644 --- a/modules/allrecipes/module.py +++ b/modules/allrecipes/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import AllrecipesBrowser @@ -27,7 +27,7 @@ __all__ = ['AllrecipesModule'] -class AllrecipesModule(BaseModule, CapRecipe): +class AllrecipesModule(Module, CapRecipe): NAME = 'allrecipes' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/ameli/module.py b/modules/ameli/module.py index fcb7ca8fd0..c1592585f2 100644 --- a/modules/ameli/module.py +++ b/modules/ameli/module.py @@ -19,14 +19,14 @@ import urllib from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AmeliBrowser __all__ = ['AmeliModule'] -class AmeliModule(BaseModule, CapBill): +class AmeliModule(Module, CapBill): NAME = 'ameli' DESCRIPTION = u'Ameli website: French Health Insurance' MAINTAINER = u'Christophe Lampin' diff --git a/modules/amelipro/module.py b/modules/amelipro/module.py index 2b0d5d033c..9d5f44d5d4 100644 --- a/modules/amelipro/module.py +++ b/modules/amelipro/module.py @@ -19,14 +19,14 @@ import urllib from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AmeliProBrowser __all__ = ['AmeliProModule'] -class AmeliProModule(BaseModule, CapBill): +class AmeliProModule(Module, CapBill): NAME = 'amelipro' DESCRIPTION = u'Ameli website: French Health Insurance for Professionals' MAINTAINER = u'Christophe Lampin' diff --git a/modules/americanexpress/module.py b/modules/americanexpress/module.py index 9ea18e8a53..2bd42a7fe0 100644 --- a/modules/americanexpress/module.py +++ b/modules/americanexpress/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AmericanExpressBrowser @@ -29,7 +29,7 @@ __all__ = ['AmericanExpressModule'] -class AmericanExpressModule(BaseModule, CapBank): +class AmericanExpressModule(Module, CapBank): NAME = 'americanexpress' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/apec/module.py b/modules/apec/module.py index e8cb6540ba..d027e32d9c 100644 --- a/modules/apec/module.py +++ b/modules/apec/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.job import CapJob from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value @@ -28,7 +28,7 @@ __all__ = ['ApecModule'] -class ApecModule(BaseModule, CapJob): +class ApecModule(Module, CapJob): NAME = 'apec' DESCRIPTION = u'apec website' MAINTAINER = u'Bezleputh' diff --git a/modules/apivie/module.py b/modules/apivie/module.py index 76a6d4015a..c1ec58a458 100644 --- a/modules/apivie/module.py +++ b/modules/apivie/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.bank import CapBank -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import ApivieBrowser @@ -27,7 +27,7 @@ __all__ = ['ApivieModule'] -class ApivieModule(BaseModule, CapBank): +class ApivieModule(Module, CapBank): NAME = 'apivie' DESCRIPTION = u'Apivie' MAINTAINER = u'Romain Bignon' diff --git a/modules/arretsurimages/module.py b/modules/arretsurimages/module.py index c7490a375b..56724147d5 100644 --- a/modules/arretsurimages/module.py +++ b/modules/arretsurimages/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import ArretSurImagesBrowser @@ -29,7 +29,7 @@ __all__ = ['ArretSurImagesModule'] -class ArretSurImagesModule(BaseModule, CapVideo, CapCollection): +class ArretSurImagesModule(Module, CapVideo, CapCollection): NAME = 'arretsurimages' DESCRIPTION = u'arretsurimages website' MAINTAINER = u'franek' diff --git a/modules/arte/module.py b/modules/arte/module.py index 75cc094b61..e85383d297 100644 --- a/modules/arte/module.py +++ b/modules/arte/module.py @@ -22,7 +22,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value from .browser import ArteBrowser @@ -32,7 +32,7 @@ __all__ = ['ArteModule'] -class ArteModule(BaseModule, CapVideo, CapCollection): +class ArteModule(Module, CapVideo, CapCollection): NAME = 'arte' MAINTAINER = u'Bezleputh' EMAIL = 'carton_ben@yahoo.fr' diff --git a/modules/attilasub/module.py b/modules/attilasub/module.py index 76b8ed583f..fc63846764 100644 --- a/modules/attilasub/module.py +++ b/modules/attilasub/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import AttilasubBrowser @@ -27,7 +27,7 @@ __all__ = ['AttilasubModule'] -class AttilasubModule(BaseModule, CapSubtitle): +class AttilasubModule(Module, CapSubtitle): NAME = 'attilasub' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/audioaddict/module.py b/modules/audioaddict/module.py index bdf133304b..dc561e7a56 100644 --- a/modules/audioaddict/module.py +++ b/modules/audioaddict/module.py @@ -22,7 +22,7 @@ from weboob.capabilities.audiostream import BaseAudioStream from weboob.tools.capabilities.streaminfo import StreamInfo from weboob.capabilities.collection import CapCollection, Collection -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value from weboob.tools.browser import StandardBrowser import time @@ -38,7 +38,7 @@ # option to another player in the ~/.config/weboob/radioob config file: # [ROOT] # media_player = your_non_mplayer_player -class AudioAddictModule(BaseModule, CapRadio, CapCollection): +class AudioAddictModule(Module, CapRadio, CapCollection): NAME = 'audioaddict' MAINTAINER = u'Pierre Mazière' EMAIL = 'pierre.maziere@gmx.com' diff --git a/modules/aum/module.py b/modules/aum/module.py index 3857fbaf21..3dd23528f4 100644 --- a/modules/aum/module.py +++ b/modules/aum/module.py @@ -33,7 +33,7 @@ from weboob.capabilities.dating import CapDating, OptimizationNotFound, Event from weboob.capabilities.contact import CapContact, ContactPhoto, Query, QueryError from weboob.capabilities.account import CapAccount, StatusField -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.browser import BrowserUnavailable, BrowserHTTPNotFound from weboob.tools.value import Value, ValuesDict, ValueBool, ValueBackendPassword from weboob.tools.log import getLogger @@ -57,7 +57,7 @@ def parse_dt(s): return local2utc(d) -class AuMModule(BaseModule, CapMessages, CapMessagesPost, CapDating, CapChat, CapContact, CapAccount): +class AuMModule(Module, CapMessages, CapMessagesPost, CapDating, CapChat, CapContact, CapAccount): NAME = 'aum' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' @@ -79,7 +79,7 @@ class AuMModule(BaseModule, CapMessages, CapMessagesPost, CapDating, CapChat, Ca MAGIC_ID_BASKET = 1 def __init__(self, *args, **kwargs): - BaseModule.__init__(self, *args, **kwargs) + Module.__init__(self, *args, **kwargs) if self.config['antispam'].get(): self.antispam = AntiSpam() else: diff --git a/modules/axabanque/module.py b/modules/axabanque/module.py index 9242acb5fa..2ef255d0d1 100644 --- a/modules/axabanque/module.py +++ b/modules/axabanque/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AXABanque @@ -28,7 +28,7 @@ __all__ = ['AXABanqueModule'] -class AXABanqueModule(BaseModule, CapBank): +class AXABanqueModule(Module, CapBank): NAME = 'axabanque' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/banqueaccord/module.py b/modules/banqueaccord/module.py index 5689308087..c9d68e1be4 100644 --- a/modules/banqueaccord/module.py +++ b/modules/banqueaccord/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.base import find_object from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import BanqueAccordBrowser @@ -29,7 +29,7 @@ __all__ = ['BanqueAccordModule'] -class BanqueAccordModule(BaseModule, CapBank): +class BanqueAccordModule(Module, CapBank): NAME = 'banqueaccord' DESCRIPTION = u'Banque Accord' MAINTAINER = u'Romain Bignon' diff --git a/modules/banquepopulaire/module.py b/modules/banquepopulaire/module.py index 93ec4aa468..abfe8da632 100644 --- a/modules/banquepopulaire/module.py +++ b/modules/banquepopulaire/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import ValueBackendPassword, Value @@ -29,7 +29,7 @@ __all__ = ['BanquePopulaireModule'] -class BanquePopulaireModule(BaseModule, CapBank): +class BanquePopulaireModule(Module, CapBank): NAME = 'banquepopulaire' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/barclays/module.py b/modules/barclays/module.py index 8edd74f1c8..5706a08c86 100644 --- a/modules/barclays/module.py +++ b/modules/barclays/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Barclays @@ -28,7 +28,7 @@ __all__ = ['BarclaysModule'] -class BarclaysModule(BaseModule, CapBank): +class BarclaysModule(Module, CapBank): NAME = 'barclays' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/biplan/module.py b/modules/biplan/module.py index 3134957860..f08262eb5b 100644 --- a/modules/biplan/module.py +++ b/modules/biplan/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES import itertools @@ -28,7 +28,7 @@ __all__ = ['BiplanModule'] -class BiplanModule(BaseModule, CapCalendarEvent): +class BiplanModule(Module, CapCalendarEvent): NAME = 'biplan' DESCRIPTION = u'lebiplan.org website' MAINTAINER = u'Bezleputh' diff --git a/modules/bnporc/module.py b/modules/bnporc/module.py index f22c55e292..78f26a44e8 100644 --- a/modules/bnporc/module.py +++ b/modules/bnporc/module.py @@ -23,7 +23,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound, Account, Recipient from weboob.capabilities.messages import CapMessages, Thread -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import BNPorc @@ -33,7 +33,7 @@ __all__ = ['BNPorcModule'] -class BNPorcModule(BaseModule, CapBank, CapMessages): +class BNPorcModule(Module, CapBank, CapMessages): NAME = 'bnporc' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' @@ -54,7 +54,7 @@ class BNPorcModule(BaseModule, CapBank, CapMessages): CACHE_THREADS = timedelta(seconds=3 * 60 * 60) def __init__(self, *args, **kwargs): - BaseModule.__init__(self, *args, **kwargs) + Module.__init__(self, *args, **kwargs) self._threads = None self._threads_age = datetime.utcnow() diff --git a/modules/boursorama/module.py b/modules/boursorama/module.py index a8c02e882f..c72385f490 100644 --- a/modules/boursorama/module.py +++ b/modules/boursorama/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, ValueBool, Value from .browser import Boursorama @@ -30,7 +30,7 @@ __all__ = ['BoursoramaModule'] -class BoursoramaModule(BaseModule, CapBank): +class BoursoramaModule(Module, CapBank): NAME = 'boursorama' MAINTAINER = u'Gabriel Kerneis' EMAIL = 'gabriel@kerneis.info' diff --git a/modules/bouygues/module.py b/modules/bouygues/module.py index 4095789066..87567303d4 100644 --- a/modules/bouygues/module.py +++ b/modules/bouygues/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.messages import CantSendMessage, CapMessages, CapMessagesPost -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import BouyguesBrowser @@ -30,7 +30,7 @@ __all__ = ['BouyguesModule'] -class BouyguesModule(BaseModule, CapMessages, CapMessagesPost): +class BouyguesModule(Module, CapMessages, CapMessagesPost): NAME = 'bouygues' MAINTAINER = u'Christophe Benz' EMAIL = 'christophe.benz@gmail.com' diff --git a/modules/bp/module.py b/modules/bp/module.py index 35ff07e3cd..e286cdfd07 100644 --- a/modules/bp/module.py +++ b/modules/bp/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, Account -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import BPBrowser @@ -28,7 +28,7 @@ __all__ = ['BPModule'] -class BPModule(BaseModule, CapBank): +class BPModule(Module, CapBank): NAME = 'bp' MAINTAINER = u'Nicolas Duhamel' EMAIL = 'nicolas@jombi.fr' diff --git a/modules/bred/module.py b/modules/bred/module.py index 1cf61973b0..73da2bd74e 100644 --- a/modules/bred/module.py +++ b/modules/bred/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import BredBrowser @@ -29,7 +29,7 @@ __all__ = ['BredModule'] -class BredModule(BaseModule, CapBank): +class BredModule(Module, CapBank): NAME = 'bred' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/btdigg/module.py b/modules/btdigg/module.py index db502fe400..bc2cfe432a 100644 --- a/modules/btdigg/module.py +++ b/modules/btdigg/module.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- from weboob.capabilities.torrent import CapTorrent -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import BTDiggBrowser __all__ = ['BTDiggModule'] -class BTDiggModule(BaseModule, CapTorrent): +class BTDiggModule(Module, CapTorrent): NAME = 'btdigg' MAINTAINER = u'Matthieu Rakotojaona' EMAIL = 'matthieu.rakotojaona@gmail.com' diff --git a/modules/btmon/module.py b/modules/btmon/module.py index 51fc77feb2..0975efb58f 100644 --- a/modules/btmon/module.py +++ b/modules/btmon/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.torrent import CapTorrent, Torrent -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import BtmonBrowser @@ -27,7 +27,7 @@ __all__ = ['BtmonModule'] -class BtmonModule(BaseModule, CapTorrent): +class BtmonModule(Module, CapTorrent): NAME = 'btmon' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/caissedepargne/module.py b/modules/caissedepargne/module.py index ce46d61286..b0a2163881 100644 --- a/modules/caissedepargne/module.py +++ b/modules/caissedepargne/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value, ValueBackendPassword from .browser import CaisseEpargne @@ -28,7 +28,7 @@ __all__ = ['CaisseEpargneModule'] -class CaisseEpargneModule(BaseModule, CapBank): +class CaisseEpargneModule(Module, CapBank): NAME = 'caissedepargne' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/canalplus/module.py b/modules/canalplus/module.py index e7ecb66e34..2ae2754cc2 100644 --- a/modules/canalplus/module.py +++ b/modules/canalplus/module.py @@ -20,7 +20,7 @@ import re from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value from .browser import CanalplusBrowser @@ -32,7 +32,7 @@ __all__ = ['CanalplusModule'] -class CanalplusModule(BaseModule, CapVideo, CapCollection): +class CanalplusModule(Module, CapVideo, CapCollection): NAME = 'canalplus' MAINTAINER = u'Nicolas Duhamel' EMAIL = 'nicolas@jombi.fr' diff --git a/modules/canaltp/module.py b/modules/canaltp/module.py index fdeda7b8d4..c2e2443c95 100644 --- a/modules/canaltp/module.py +++ b/modules/canaltp/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.travel import CapTravel, Station, Departure -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import CanalTP @@ -26,7 +26,7 @@ __all__ = ['CanalTPModule'] -class CanalTPModule(BaseModule, CapTravel): +class CanalTPModule(Module, CapTravel): NAME = 'canaltp' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/cappedtv/module.py b/modules/cappedtv/module.py index b72c00e950..17574daa72 100644 --- a/modules/cappedtv/module.py +++ b/modules/cappedtv/module.py @@ -12,14 +12,14 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import CappedBrowser, CappedVideo __all__ = ['CappedModule'] -class CappedModule(BaseModule, CapVideo, CapCollection): +class CappedModule(Module, CapVideo, CapCollection): NAME = 'cappedtv' MAINTAINER = u'Lord' EMAIL = 'lord@lordtoniok.com' diff --git a/modules/carrefourbanque/module.py b/modules/carrefourbanque/module.py index 33f392477d..3fc7013b72 100644 --- a/modules/carrefourbanque/module.py +++ b/modules/carrefourbanque/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.base import find_object from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import CarrefourBanque @@ -29,7 +29,7 @@ __all__ = ['CarrefourBanqueModule'] -class CarrefourBanqueModule(BaseModule, CapBank): +class CarrefourBanqueModule(Module, CapBank): NAME = 'carrefourbanque' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/cci/module.py b/modules/cci/module.py index 8842f790a5..31542f69d2 100644 --- a/modules/cci/module.py +++ b/modules/cci/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.job import CapJob, BaseJobAdvert from weboob.tools.value import Value @@ -28,7 +28,7 @@ __all__ = ['CciModule'] -class CciModule(BaseModule, CapJob): +class CciModule(Module, CapJob): NAME = 'cci' DESCRIPTION = u'cci website' MAINTAINER = u'Bezleputh' diff --git a/modules/champslibres/module.py b/modules/champslibres/module.py index 072554d4d9..991b1cdf97 100644 --- a/modules/champslibres/module.py +++ b/modules/champslibres/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.library import CapBook -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import ChampslibresBrowser @@ -28,7 +28,7 @@ __all__ = ['ChampslibresModule'] -class ChampslibresModule(BaseModule, CapBook): +class ChampslibresModule(Module, CapBook): NAME = 'champslibres' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/chronopost/module.py b/modules/chronopost/module.py index e0299ab12c..4d2c5ca61b 100644 --- a/modules/chronopost/module.py +++ b/modules/chronopost/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.parcel import CapParcel -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import ChronopostBrowser @@ -27,7 +27,7 @@ __all__ = ['ChronopostModule'] -class ChronopostModule(BaseModule, CapParcel): +class ChronopostModule(Module, CapParcel): NAME = 'chronopost' DESCRIPTION = u'Chronopost website' MAINTAINER = u'Romain Bignon' diff --git a/modules/cic/module.py b/modules/cic/module.py index 0a37e798f8..18548a9053 100644 --- a/modules/cic/module.py +++ b/modules/cic/module.py @@ -23,7 +23,7 @@ import string from weboob.capabilities.bank import CapBank, AccountNotFound, Recipient, Account -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import CICBrowser @@ -32,7 +32,7 @@ __all__ = ['CICModule'] -class CICModule(BaseModule, CapBank): +class CICModule(Module, CapBank): NAME = 'cic' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/citelis/module.py b/modules/citelis/module.py index 49b93c3495..1d5ac04665 100644 --- a/modules/citelis/module.py +++ b/modules/citelis/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from weboob.capabilities.bank import CapBank, AccountNotFound @@ -28,7 +28,7 @@ __all__ = ['CitelisModule'] -class CitelisModule(BaseModule, CapBank): +class CitelisModule(Module, CapBank): NAME = 'citelis' DESCRIPTION = u'Citélis' MAINTAINER = u'Laurent Bachelier' diff --git a/modules/cmb/module.py b/modules/cmb/module.py index f1dabec6ee..51840968da 100644 --- a/modules/cmb/module.py +++ b/modules/cmb/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound from weboob.capabilities.bank import Account, Transaction -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from weboob.capabilities.base import NotAvailable from weboob.tools.exceptions import BrowserIncorrectPassword, ParseError @@ -36,7 +36,7 @@ __all__ = ['CmbModule'] -class CmbModule(BaseModule, CapBank): +class CmbModule(Module, CapBank): NAME = 'cmb' MAINTAINER = u'Johann Broudin' EMAIL = 'Johann.Broudin@6-8.fr' diff --git a/modules/cmso/module.py b/modules/cmso/module.py index 6d54b46a22..51db9acb1c 100644 --- a/modules/cmso/module.py +++ b/modules/cmso/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Cmso @@ -28,7 +28,7 @@ __all__ = ['CmsoModule'] -class CmsoModule(BaseModule, CapBank): +class CmsoModule(Module, CapBank): NAME = 'cmso' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/colisprive/module.py b/modules/colisprive/module.py index c66565e75b..33125ff0f1 100644 --- a/modules/colisprive/module.py +++ b/modules/colisprive/module.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . from weboob.capabilities.parcel import CapParcel -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import ColispriveBrowser __all__ = ['ColispriveModule'] -class ColispriveModule(BaseModule, CapParcel): +class ColispriveModule(Module, CapParcel): NAME = 'colisprive' DESCRIPTION = u'Colisprive parcel tracking website' MAINTAINER = u'Florent Fourcot' diff --git a/modules/colissimo/module.py b/modules/colissimo/module.py index 0ebdc00a5d..3791ed8a97 100644 --- a/modules/colissimo/module.py +++ b/modules/colissimo/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.parcel import CapParcel, Parcel, Event, ParcelNotFound -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import ColissimoBrowser from datetime import date @@ -26,7 +26,7 @@ __all__ = ['ColissimoModule'] -class ColissimoModule(BaseModule, CapParcel): +class ColissimoModule(Module, CapParcel): NAME = 'colissimo' DESCRIPTION = u'Colissimo parcel tracking website' MAINTAINER = u'Florent Fourcot' diff --git a/modules/cragr/module.py b/modules/cragr/module.py index 96ea72449c..7c49fa1311 100644 --- a/modules/cragr/module.py +++ b/modules/cragr/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import ValueBackendPassword, Value @@ -30,7 +30,7 @@ __all__ = ['CragrModule'] -class CragrModule(BaseModule, CapBank): +class CragrModule(Module, CapBank): NAME = 'cragr' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/creditcooperatif/module.py b/modules/creditcooperatif/module.py index aedece5cbc..dcc68abc0f 100644 --- a/modules/creditcooperatif/module.py +++ b/modules/creditcooperatif/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .perso.browser import CreditCooperatif as CreditCooperatifPerso @@ -29,7 +29,7 @@ __all__ = ['CreditCooperatifModule'] -class CreditCooperatifModule(BaseModule, CapBank): +class CreditCooperatifModule(Module, CapBank): NAME = 'creditcooperatif' MAINTAINER = u'Kevin Pouget' EMAIL = 'weboob@kevin.pouget.me' diff --git a/modules/creditdunord/module.py b/modules/creditdunord/module.py index 42309e5c39..ecb3a1ce29 100644 --- a/modules/creditdunord/module.py +++ b/modules/creditdunord/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import ValueBackendPassword, Value @@ -30,7 +30,7 @@ __all__ = ['CreditDuNordModule'] -class CreditDuNordModule(BaseModule, CapBank): +class CreditDuNordModule(Module, CapBank): NAME = 'creditdunord' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/creditmutuel/module.py b/modules/creditmutuel/module.py index 0eb91d0296..2bdcfed56a 100644 --- a/modules/creditmutuel/module.py +++ b/modules/creditmutuel/module.py @@ -24,7 +24,7 @@ import string from weboob.capabilities.bank import CapBank, AccountNotFound, Recipient, Account -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import CreditMutuelBrowser @@ -33,7 +33,7 @@ __all__ = ['CreditMutuelModule'] -class CreditMutuelModule(BaseModule, CapBank): +class CreditMutuelModule(Module, CapBank): NAME = 'creditmutuel' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/cuisineaz/module.py b/modules/cuisineaz/module.py index c8ba9a93b9..ba09aaf411 100644 --- a/modules/cuisineaz/module.py +++ b/modules/cuisineaz/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import CuisineazBrowser @@ -30,7 +30,7 @@ def strip_accents(s): return ''.join(c for c in unicodedata.normalize('NFD', s) if unicodedata.category(c) != 'Mn') -class CuisineazModule(BaseModule, CapRecipe): +class CuisineazModule(Module, CapRecipe): NAME = 'cuisineaz' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/dailymotion/module.py b/modules/dailymotion/module.py index 14e49be404..b122e78638 100644 --- a/modules/dailymotion/module.py +++ b/modules/dailymotion/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import DailymotionBrowser from .video import DailymotionVideo @@ -28,7 +28,7 @@ __all__ = ['DailymotionModule'] -class DailymotionModule(BaseModule, CapVideo, CapCollection): +class DailymotionModule(Module, CapVideo, CapCollection): NAME = 'dailymotion' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/delubac/module.py b/modules/delubac/module.py index c63c35817c..359c2ba4d5 100644 --- a/modules/delubac/module.py +++ b/modules/delubac/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.bank import CapBank -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import DelubacBrowser @@ -27,7 +27,7 @@ __all__ = ['DelubacModule'] -class DelubacModule(BaseModule, CapBank): +class DelubacModule(Module, CapBank): NAME = 'delubac' DESCRIPTION = u'Banque Delubac & Cie' MAINTAINER = u'Noe Rubinstein' diff --git a/modules/dlfp/module.py b/modules/dlfp/module.py index 4ac1d0e6f2..5ddbb1c9a8 100644 --- a/modules/dlfp/module.py +++ b/modules/dlfp/module.py @@ -23,7 +23,7 @@ from datetime import datetime, timedelta import time -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.browser import BrowserForbidden from weboob.tools.newsfeed import Newsfeed from weboob.tools.value import Value, ValueBool, ValueBackendPassword @@ -37,7 +37,7 @@ __all__ = ['DLFPModule'] -class DLFPModule(BaseModule, CapMessages, CapMessagesPost, CapContent): +class DLFPModule(Module, CapMessages, CapMessagesPost, CapContent): NAME = 'dlfp' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/dresdenwetter/module.py b/modules/dresdenwetter/module.py index 163c3d30e9..65c2cc16f0 100644 --- a/modules/dresdenwetter/module.py +++ b/modules/dresdenwetter/module.py @@ -22,13 +22,13 @@ from weboob.capabilities.gauge import CapGauge, GaugeSensor, Gauge,\ SensorNotFound from weboob.capabilities.base import find_object -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module __all__ = ['DresdenWetterModule'] -class DresdenWetterModule(BaseModule, CapGauge): +class DresdenWetterModule(Module, CapGauge): NAME = 'dresdenwetter' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/ebonics/module.py b/modules/ebonics/module.py index c914a22c76..94a7250ccc 100644 --- a/modules/ebonics/module.py +++ b/modules/ebonics/module.py @@ -21,14 +21,14 @@ import urllib from weboob.capabilities.translate import CapTranslate, Translation, TranslationFail, LanguageNotSupported -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.browser import StandardBrowser __all__ = ['EbonicsModule'] -class EbonicsModule(BaseModule, CapTranslate): +class EbonicsModule(Module, CapTranslate): NAME = 'ebonics' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/edf/module.py b/modules/edf/module.py index 5201187599..1847d0d5e0 100644 --- a/modules/edf/module.py +++ b/modules/edf/module.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import EdfBrowser __all__ = ['EdfModule'] -class EdfModule(BaseModule, CapBill): +class EdfModule(Module, CapBill): NAME = 'edf' DESCRIPTION = u'Edf website: French power provider' MAINTAINER = u'Christophe Gouiran' diff --git a/modules/ehentai/module.py b/modules/ehentai/module.py index c080e0b5b9..839961969e 100644 --- a/modules/ehentai/module.py +++ b/modules/ehentai/module.py @@ -22,7 +22,7 @@ import re from weboob.capabilities.gallery import CapGallery, BaseGallery from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.misc import ratelimit from weboob.tools.value import Value, ValueBackendPassword @@ -33,7 +33,7 @@ __all__ = ['EHentaiModule'] -class EHentaiModule(BaseModule, CapGallery, CapCollection): +class EHentaiModule(Module, CapGallery, CapCollection): NAME = 'ehentai' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/europarl/module.py b/modules/europarl/module.py index 338e05df0c..1749c696ec 100644 --- a/modules/europarl/module.py +++ b/modules/europarl/module.py @@ -22,7 +22,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.collection import CapCollection, CollectionNotFound from .browser import EuroparlBrowser @@ -32,7 +32,7 @@ __all__ = ['EuroparlModule'] -class EuroparlModule(BaseModule, CapVideo, CapCollection): +class EuroparlModule(Module, CapVideo, CapCollection): NAME = 'europarl' MAINTAINER = u'François Revol' EMAIL = 'revol@free.fr' diff --git a/modules/feedly/module.py b/modules/feedly/module.py index 08a037c672..7e28b01a9f 100644 --- a/modules/feedly/module.py +++ b/modules/feedly/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.collection import CapCollection from weboob.capabilities.messages import CapMessages, Message, Thread from weboob.tools.value import Value, ValueBackendPassword @@ -29,7 +29,7 @@ __all__ = ['FeedlyModule'] -class FeedlyModule(BaseModule, CapMessages, CapCollection): +class FeedlyModule(Module, CapMessages, CapCollection): NAME = 'feedly' DESCRIPTION = u'handle the popular RSS reading service Feedly' MAINTAINER = u'Bezleputh' diff --git a/modules/fortuneo/module.py b/modules/fortuneo/module.py index 8700180038..b561eca25f 100644 --- a/modules/fortuneo/module.py +++ b/modules/fortuneo/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Fortuneo @@ -28,7 +28,7 @@ __all__ = ['FortuneoModule'] -class FortuneoModule(BaseModule, CapBank): +class FortuneoModule(Module, CapBank): NAME = 'fortuneo' MAINTAINER = u'Gilles-Alexandre Quenot' EMAIL = 'gilles.quenot@gmail.com' diff --git a/modules/fourchan/module.py b/modules/fourchan/module.py index f664f0f795..60e1cf1d88 100644 --- a/modules/fourchan/module.py +++ b/modules/fourchan/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.messages import CapMessages, Message, Thread -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value from .browser import FourChan @@ -30,7 +30,7 @@ __all__ = ['FourChanModule'] -class FourChanModule(BaseModule, CapMessages): +class FourChanModule(Module, CapMessages): NAME = 'fourchan' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/francetelevisions/module.py b/modules/francetelevisions/module.py index ce1efa5cdd..cf5a021ff9 100644 --- a/modules/francetelevisions/module.py +++ b/modules/francetelevisions/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import PluzzBrowser @@ -28,7 +28,7 @@ __all__ = ['PluzzModule'] -class PluzzModule(BaseModule, CapVideo, CapCollection): +class PluzzModule(Module, CapVideo, CapCollection): NAME = 'francetelevisions' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/freemobile/module.py b/modules/freemobile/module.py index e1c282ea1f..304c62eb2f 100644 --- a/modules/freemobile/module.py +++ b/modules/freemobile/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bill import CapBill, Subscription, Bill, SubscriptionNotFound, BillNotFound from weboob.capabilities.base import find_object -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Freemobile @@ -28,7 +28,7 @@ __all__ = ['FreeMobileModule'] -class FreeMobileModule(BaseModule, CapBill): +class FreeMobileModule(Module, CapBill): NAME = 'freemobile' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/ganassurances/module.py b/modules/ganassurances/module.py index ff01be40f6..d790c1d6a7 100644 --- a/modules/ganassurances/module.py +++ b/modules/ganassurances/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import ValueBackendPassword, Value @@ -29,7 +29,7 @@ __all__ = ['GanAssurancesModule'] -class GanAssurancesModule(BaseModule, CapBank): +class GanAssurancesModule(Module, CapBank): NAME = 'ganassurances' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/gazelle/module.py b/modules/gazelle/module.py index 9628cbe255..de7d7ee793 100644 --- a/modules/gazelle/module.py +++ b/modules/gazelle/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.torrent import CapTorrent -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import GazelleBrowser @@ -27,7 +27,7 @@ __all__ = ['GazelleModule'] -class GazelleModule(BaseModule, CapTorrent): +class GazelleModule(Module, CapTorrent): NAME = 'gazelle' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/gdcvault/module.py b/modules/gdcvault/module.py index c78ed2c56f..885fc8f9eb 100644 --- a/modules/gdcvault/module.py +++ b/modules/gdcvault/module.py @@ -22,7 +22,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.collection import CapCollection, CollectionNotFound from weboob.tools.value import Value, ValueBackendPassword @@ -33,7 +33,7 @@ __all__ = ['GDCVaultModule'] -class GDCVaultModule(BaseModule, CapVideo, CapCollection): +class GDCVaultModule(Module, CapVideo, CapCollection): NAME = 'gdcvault' MAINTAINER = u'François Revol' EMAIL = 'revol@free.fr' diff --git a/modules/gdfsuez/module.py b/modules/gdfsuez/module.py index 7bfb2fb4f3..753567548f 100644 --- a/modules/gdfsuez/module.py +++ b/modules/gdfsuez/module.py @@ -19,14 +19,14 @@ from weboob.capabilities.bill import CapBill, SubscriptionNotFound,\ BillNotFound, Subscription, Bill -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import GdfSuez __all__ = ['GdfSuezModule'] -class GdfSuezModule(BaseModule, CapBill): +class GdfSuezModule(Module, CapBill): NAME = 'gdfsuez' MAINTAINER = u'Mathieu Jourdan' EMAIL = 'mathieu.jourdan@gresille.org' diff --git a/modules/geolocip/module.py b/modules/geolocip/module.py index be89460b99..686e288ebd 100644 --- a/modules/geolocip/module.py +++ b/modules/geolocip/module.py @@ -20,14 +20,14 @@ from weboob.capabilities.geolocip import CapGeolocIp, IpLocation -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.browser import BaseBrowser, BrowserUnavailable __all__ = ['GeolocIpModule'] -class GeolocIpModule(BaseModule, CapGeolocIp): +class GeolocIpModule(Module, CapGeolocIp): NAME = 'geolocip' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/github/module.py b/modules/github/module.py index 6e4f8654c6..984de02d6f 100644 --- a/modules/github/module.py +++ b/modules/github/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value, ValueBackendPassword from weboob.capabilities.bugtracker import CapBugTracker, Issue, Project, User, Version, Status, Update, Attachment @@ -32,7 +32,7 @@ 'closed': Status('closed', u'closed', Status.VALUE_RESOLVED)} # TODO tentatively parse github "labels"? -class GithubModule(BaseModule, CapBugTracker): +class GithubModule(Module, CapBugTracker): NAME = 'github' DESCRIPTION = u'GitHub issues tracking' MAINTAINER = u'Vincent A' diff --git a/modules/googletranslate/module.py b/modules/googletranslate/module.py index 09efe4dd7b..d4bb0910fc 100644 --- a/modules/googletranslate/module.py +++ b/modules/googletranslate/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.translate import CapTranslate, Translation, TranslationFail, LanguageNotSupported -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import GoogleTranslateBrowser @@ -28,7 +28,7 @@ __all__ = ['GoogleTranslateModule'] -class GoogleTranslateModule(BaseModule, CapTranslate): +class GoogleTranslateModule(Module, CapTranslate): MAINTAINER = u'Lucien Loiseau' EMAIL = 'loiseau.lucien@gmail.com' VERSION = '1.0' diff --git a/modules/grooveshark/module.py b/modules/grooveshark/module.py index 339ca5363d..45d7b72201 100644 --- a/modules/grooveshark/module.py +++ b/modules/grooveshark/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.audio import CapAudio, BaseAudio, Album, Playlist, decode_id from weboob.capabilities.collection import CapCollection, CollectionNotFound from .browser import GroovesharkBrowser @@ -35,7 +35,7 @@ def cmp_id(p1, p2): return -1 -class GroovesharkModule(BaseModule, CapAudio, CapCollection): +class GroovesharkModule(Module, CapAudio, CapCollection): NAME = 'grooveshark' DESCRIPTION = u'Grooveshark music streaming website' MAINTAINER = u'Bezleputh' diff --git a/modules/groupamaes/module.py b/modules/groupamaes/module.py index 2e8ea4ea7a..2919527777 100644 --- a/modules/groupamaes/module.py +++ b/modules/groupamaes/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from weboob.capabilities.base import find_object @@ -28,7 +28,7 @@ __all__ = ['GroupamaesModule'] -class GroupamaesModule(BaseModule, CapBank): +class GroupamaesModule(Module, CapBank): NAME = 'groupamaes' DESCRIPTION = u"Groupama Épargne Salariale" MAINTAINER = u'Bezleputh' diff --git a/modules/guerrillamail/module.py b/modules/guerrillamail/module.py index f8600d0685..449386e34a 100644 --- a/modules/guerrillamail/module.py +++ b/modules/guerrillamail/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.messages import CapMessages, CapMessagesPost, Thread, Message from weboob.tools.value import Value @@ -28,7 +28,7 @@ __all__ = ['GuerrillamailModule'] -class GuerrillamailModule(BaseModule, CapMessages, CapMessagesPost): +class GuerrillamailModule(Module, CapMessages, CapMessagesPost): NAME = 'guerrillamail' DESCRIPTION = u'GuerrillaMail temp mailbox' MAINTAINER = u'Vincent A' diff --git a/modules/hds/module.py b/modules/hds/module.py index e6ffed3f0a..4fa91c93b4 100644 --- a/modules/hds/module.py +++ b/modules/hds/module.py @@ -20,7 +20,7 @@ -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.messages import CapMessages, Message, Thread from .browser import HDSBrowser @@ -29,7 +29,7 @@ __all__ = ['HDSModule'] -class HDSModule(BaseModule, CapMessages): +class HDSModule(Module, CapMessages): NAME = 'hds' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/hellobank/module.py b/modules/hellobank/module.py index 992ff0dac1..077982a414 100644 --- a/modules/hellobank/module.py +++ b/modules/hellobank/module.py @@ -24,7 +24,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound, Account, Recipient from weboob.capabilities.messages import CapMessages, Thread -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import HelloBank @@ -33,7 +33,7 @@ __all__ = ['HelloBankModule'] -class HelloBankModule(BaseModule, CapBank, CapMessages): +class HelloBankModule(Module, CapBank, CapMessages): NAME = 'hellobank' MAINTAINER = u'Christophe Lampin' EMAIL = 'weboob@lampin.net' @@ -49,7 +49,7 @@ class HelloBankModule(BaseModule, CapBank, CapMessages): CACHE_THREADS = timedelta(seconds=3 * 60 * 60) def __init__(self, *args, **kwargs): - BaseModule.__init__(self, *args, **kwargs) + Module.__init__(self, *args, **kwargs) self._threads = None self._threads_age = datetime.utcnow() diff --git a/modules/hsbc/module.py b/modules/hsbc/module.py index 4367dce01c..1873c84acc 100644 --- a/modules/hsbc/module.py +++ b/modules/hsbc/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound from weboob.capabilities.base import find_object -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import HSBC @@ -30,7 +30,7 @@ __all__ = ['HSBCModule'] -class HSBCModule(BaseModule, CapBank): +class HSBCModule(Module, CapBank): NAME = 'hsbc' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/hybride/module.py b/modules/hybride/module.py index 5a0f58530e..39e3fc6412 100644 --- a/modules/hybride/module.py +++ b/modules/hybride/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES from .browser import HybrideBrowser @@ -27,7 +27,7 @@ __all__ = ['HybrideModule'] -class HybrideModule(BaseModule, CapCalendarEvent): +class HybrideModule(Module, CapCalendarEvent): NAME = 'hybride' DESCRIPTION = u'hybride website' MAINTAINER = u'Bezleputh' diff --git a/modules/imdb/module.py b/modules/imdb/module.py index 2f99f5e6c2..a716c4b61c 100644 --- a/modules/imdb/module.py +++ b/modules/imdb/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.cinema import CapCinema, Person, Movie -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import ImdbBrowser @@ -27,7 +27,7 @@ __all__ = ['ImdbModule'] -class ImdbModule(BaseModule, CapCinema): +class ImdbModule(Module, CapCinema): NAME = 'imdb' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/imgur/module.py b/modules/imgur/module.py index 982693726b..53493a0097 100644 --- a/modules/imgur/module.py +++ b/modules/imgur/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.paste import CapPaste, BasePaste from weboob.tools.capabilities.paste import image_mime from weboob.capabilities.base import StringField @@ -43,7 +43,7 @@ def raw_url(self): return 'http://i.imgur.com/%s.png' % self.id -class ImgurModule(BaseModule, CapPaste): +class ImgurModule(Module, CapPaste): NAME = 'imgur' DESCRIPTION = u'imgur image upload service' MAINTAINER = u'Vincent A' diff --git a/modules/ina/module.py b/modules/ina/module.py index 6d281e08b0..cd33f2bd45 100644 --- a/modules/ina/module.py +++ b/modules/ina/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.video import CapVideo -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import InaBrowser from .video import InaVideo @@ -28,7 +28,7 @@ __all__ = ['InaModule'] -class InaModule(BaseModule, CapVideo): +class InaModule(Module, CapVideo): NAME = 'ina' MAINTAINER = u'Christophe Benz' EMAIL = 'christophe.benz@gmail.com' diff --git a/modules/indeed/module.py b/modules/indeed/module.py index 9a89ffbf6e..d80ede9b41 100644 --- a/modules/indeed/module.py +++ b/modules/indeed/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.capabilities.job import CapJob, BaseJobAdvert from weboob.tools.value import Value @@ -27,7 +27,7 @@ __all__ = ['IndeedModule'] -class IndeedModule(BaseModule, CapJob): +class IndeedModule(Module, CapJob): NAME = 'indeed' DESCRIPTION = u'indeed website' MAINTAINER = u'Bezleputh' diff --git a/modules/ing/module.py b/modules/ing/module.py index 5ec1f1cce5..8f29b78ee0 100644 --- a/modules/ing/module.py +++ b/modules/ing/module.py @@ -23,7 +23,7 @@ from weboob.capabilities.bill import CapBill, Bill, Subscription,\ SubscriptionNotFound, BillNotFound from weboob.capabilities.base import UserError, find_object -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import IngBrowser @@ -31,7 +31,7 @@ __all__ = ['INGModule'] -class INGModule(BaseModule, CapBank, CapBill): +class INGModule(Module, CapBank, CapBill): NAME = 'ing' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/ipinfodb/module.py b/modules/ipinfodb/module.py index 4f7f624e3a..0d659a169a 100644 --- a/modules/ipinfodb/module.py +++ b/modules/ipinfodb/module.py @@ -20,14 +20,14 @@ from weboob.capabilities.geolocip import CapGeolocIp, IpLocation -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.browser import StandardBrowser __all__ = ['IpinfodbModule'] -class IpinfodbModule(BaseModule, CapGeolocIp): +class IpinfodbModule(Module, CapGeolocIp): NAME = 'ipinfodb' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/izneo/module.py b/modules/izneo/module.py index 42d5872834..eb270efdcd 100644 --- a/modules/izneo/module.py +++ b/modules/izneo/module.py @@ -23,7 +23,7 @@ from weboob.capabilities.gallery import CapGallery, BaseGallery, BaseImage from weboob.tools.json import json -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.browser import BaseBrowser, BasePage __all__ = ['IzneoModule'] @@ -61,7 +61,7 @@ def fill_image(self, image, fields): image.url, None, {'Referer': image.gallery.url})) -class IzneoModule(BaseModule, CapGallery): +class IzneoModule(Module, CapGallery): NAME = 'izneo' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/jacquieetmichel/module.py b/modules/jacquieetmichel/module.py index d712b1cdbd..a437b3e67a 100644 --- a/modules/jacquieetmichel/module.py +++ b/modules/jacquieetmichel/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import JacquieEtMichelBrowser from .video import JacquieEtMichelVideo @@ -28,7 +28,7 @@ __all__ = ['JacquieEtMichelModule'] -class JacquieEtMichelModule(BaseModule, CapVideo, CapCollection): +class JacquieEtMichelModule(Module, CapVideo, CapCollection): NAME = 'jacquieetmichel' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/jcvelaux/module.py b/modules/jcvelaux/module.py index 4bcbda260e..ad3f95f707 100644 --- a/modules/jcvelaux/module.py +++ b/modules/jcvelaux/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.base import StringField from weboob.capabilities.gauge import CapGauge, GaugeSensor, Gauge, GaugeMeasure, SensorNotFound from weboob.tools.value import Value @@ -51,7 +51,7 @@ class BikeSensor(GaugeSensor): latitude = StringField('Latitude of the sensor') -class jcvelauxModule(BaseModule, CapGauge): +class jcvelauxModule(Module, CapGauge): NAME = 'jcvelaux' DESCRIPTION = (u'City bike renting availability information.\nCities: %s' % u', '.join(CITIES)) diff --git a/modules/jvmalin/module.py b/modules/jvmalin/module.py index cf554a745d..1fcce46e66 100644 --- a/modules/jvmalin/module.py +++ b/modules/jvmalin/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.travel import CapTravel, RoadStep -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import JVMalin @@ -26,7 +26,7 @@ __all__ = ['JVMalinModule'] -class JVMalinModule(BaseModule, CapTravel): +class JVMalinModule(Module, CapTravel): NAME = 'jvmalin' MAINTAINER = u'Alexandre Lissy' EMAIL = 'github@lissy.me' diff --git a/modules/kickass/module.py b/modules/kickass/module.py index 80d7436fa1..372597ded1 100644 --- a/modules/kickass/module.py +++ b/modules/kickass/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.torrent import CapTorrent, Torrent -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import KickassBrowser @@ -29,7 +29,7 @@ __all__ = ['KickassModule'] -class KickassModule(BaseModule, CapTorrent): +class KickassModule(Module, CapTorrent): NAME = 'kickass' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/lacentrale/module.py b/modules/lacentrale/module.py index 41490df56c..121640a0e1 100644 --- a/modules/lacentrale/module.py +++ b/modules/lacentrale/module.py @@ -19,7 +19,7 @@ import re from weboob.capabilities.pricecomparison import CapPriceComparison, Price -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module #from weboob.tools.value import Value from .browser import LaCentraleBrowser @@ -29,7 +29,7 @@ # I implement capability -class LaCentraleModule(BaseModule, CapPriceComparison): +class LaCentraleModule(Module, CapPriceComparison): NAME = 'lacentrale' MAINTAINER = u'Vicnet' EMAIL = 'vo.publique@gmail.com' diff --git a/modules/lcl/module.py b/modules/lcl/module.py index 9455daae8d..7d6ebcd6f7 100644 --- a/modules/lcl/module.py +++ b/modules/lcl/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import LCLBrowser, LCLProBrowser @@ -31,7 +31,7 @@ __all__ = ['LCLModule'] -class LCLModule(BaseModule, CapBank): +class LCLModule(Module, CapBank): NAME = 'lcl' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/leclercmobile/module.py b/modules/leclercmobile/module.py index a85f259c31..94b6c0c301 100644 --- a/modules/leclercmobile/module.py +++ b/modules/leclercmobile/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.bill import CapBill, SubscriptionNotFound,\ BillNotFound, Subscription, Bill -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Leclercmobile @@ -29,7 +29,7 @@ __all__ = ['LeclercMobileModule'] -class LeclercMobileModule(BaseModule, CapBill): +class LeclercMobileModule(Module, CapBill): NAME = 'leclercmobile' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/lolix/module.py b/modules/lolix/module.py index f08ccb44df..86100cde7d 100644 --- a/modules/lolix/module.py +++ b/modules/lolix/module.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.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value from weboob.capabilities.job import CapJob @@ -28,7 +28,7 @@ __all__ = ['LolixModule'] -class LolixModule(BaseModule, CapJob): +class LolixModule(Module, CapJob): NAME = 'lolix' DESCRIPTION = u'Lolix French free software employment website' MAINTAINER = u'Bezleputh' diff --git a/modules/lutim/module.py b/modules/lutim/module.py index cc91f5e75e..0eafe4d1ba 100644 --- a/modules/lutim/module.py +++ b/modules/lutim/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.paste import CapPaste, BasePaste from weboob.tools.capabilities.paste import image_mime from weboob.tools.value import Value @@ -31,7 +31,7 @@ __all__ = ['LutimModule'] -class LutimModule(BaseModule, CapPaste): +class LutimModule(Module, CapPaste): NAME = 'lutim' DESCRIPTION = u'LUTIm website' MAINTAINER = u'Vincent A' diff --git a/modules/mailinator/module.py b/modules/mailinator/module.py index f42230262a..3d32bab42b 100644 --- a/modules/mailinator/module.py +++ b/modules/mailinator/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.messages import CapMessages, Thread, Message from weboob.tools.value import Value @@ -30,7 +30,7 @@ # There is only one thread per inbox, and the thread id is the inbox name # TODO but this can lead to bans if there are too many messages... -class MailinatorModule(BaseModule, CapMessages): +class MailinatorModule(Module, CapMessages): NAME = 'mailinator' DESCRIPTION = u'mailinator temp mailbox' MAINTAINER = u'Vincent A' diff --git a/modules/mareeinfo/module.py b/modules/mareeinfo/module.py index e29dddc4f0..75eba7add1 100644 --- a/modules/mareeinfo/module.py +++ b/modules/mareeinfo/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.base import find_object from weboob.capabilities.gauge import CapGauge, Gauge, SensorNotFound from .browser import MareeinfoBrowser @@ -27,7 +27,7 @@ __all__ = ['MareeinfoModule'] -class MareeinfoModule(BaseModule, CapGauge): +class MareeinfoModule(Module, CapGauge): NAME = 'mareeinfo' DESCRIPTION = u'Un module qui permet d\' aller a la pêche aux moules totalement informé' MAINTAINER = u'Bezleputh' diff --git a/modules/marmiton/module.py b/modules/marmiton/module.py index 98ad24fd11..817d5d8fad 100644 --- a/modules/marmiton/module.py +++ b/modules/marmiton/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import MarmitonBrowser @@ -27,7 +27,7 @@ __all__ = ['MarmitonModule'] -class MarmitonModule(BaseModule, CapRecipe): +class MarmitonModule(Module, CapRecipe): NAME = 'marmiton' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/mediawiki/module.py b/modules/mediawiki/module.py index be2bcd2e99..298877257f 100644 --- a/modules/mediawiki/module.py +++ b/modules/mediawiki/module.py @@ -19,7 +19,7 @@ -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.content import CapContent, Content from weboob.tools.value import ValueBackendPassword, Value @@ -30,7 +30,7 @@ __all__ = ['MediawikiModule'] -class MediawikiModule(BaseModule, CapContent): +class MediawikiModule(Module, CapContent): NAME = 'mediawiki' MAINTAINER = u'Clément Schreiner' EMAIL = 'clemux@clemux.info' diff --git a/modules/meteofrance/module.py b/modules/meteofrance/module.py index 9aa3876383..1f79be49b6 100644 --- a/modules/meteofrance/module.py +++ b/modules/meteofrance/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.weather import CapWeather -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import MeteofranceBrowser @@ -27,7 +27,7 @@ __all__ = ['MeteofranceModule'] -class MeteofranceModule(BaseModule, CapWeather): +class MeteofranceModule(Module, CapWeather): NAME = 'meteofrance' MAINTAINER = u'Cedric Defortis' EMAIL = 'cedric@aiur.fr' diff --git a/modules/monster/module.py b/modules/monster/module.py index 566d313770..e7fce458fa 100644 --- a/modules/monster/module.py +++ b/modules/monster/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.job import CapJob from weboob.tools.value import Value from weboob.tools.ordereddict import OrderedDict @@ -29,7 +29,7 @@ __all__ = ['MonsterModule'] -class MonsterModule(BaseModule, CapJob): +class MonsterModule(Module, CapJob): NAME = 'monster' DESCRIPTION = u'monster website' MAINTAINER = u'Bezleputh' diff --git a/modules/nectarine/module.py b/modules/nectarine/module.py index fb34c3f8ac..d5110bdef9 100644 --- a/modules/nectarine/module.py +++ b/modules/nectarine/module.py @@ -18,12 +18,12 @@ from weboob.capabilities.radio import CapRadio, Radio from weboob.capabilities.collection import CapCollection -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import NectarineBrowser __all__ = ['NectarineModule'] -class NectarineModule(BaseModule, CapRadio, CapCollection): +class NectarineModule(Module, CapRadio, CapCollection): NAME = 'nectarine' MAINTAINER = u'Thomas Lecavelier' EMAIL = 'thomas-weboob@lecavelier.name' diff --git a/modules/nettokom/module.py b/modules/nettokom/module.py index 55bab18a98..c6c3bc98c7 100644 --- a/modules/nettokom/module.py +++ b/modules/nettokom/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.bill import CapBill, Subscription, SubscriptionNotFound, Detail -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Nettokom @@ -29,7 +29,7 @@ __all__ = ['NettoKomModule'] -class NettoKomModule(BaseModule, CapBill): +class NettoKomModule(Module, CapBill): NAME = 'nettokom' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/newsfeed/module.py b/modules/newsfeed/module.py index 43e5c6daca..5977e3c024 100644 --- a/modules/newsfeed/module.py +++ b/modules/newsfeed/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.messages import CapMessages, Message, Thread from weboob.tools.newsfeed import Newsfeed from weboob.tools.value import Value @@ -27,7 +27,7 @@ __all__ = ['NewsfeedModule'] -class NewsfeedModule(BaseModule, CapMessages): +class NewsfeedModule(Module, CapMessages): NAME = 'newsfeed' MAINTAINER = u'Clément Schreiner' EMAIL = "clemux@clemux.info" diff --git a/modules/nihonnooto/module.py b/modules/nihonnooto/module.py index 32c3567332..bb94704fa6 100644 --- a/modules/nihonnooto/module.py +++ b/modules/nihonnooto/module.py @@ -18,12 +18,12 @@ from weboob.capabilities.radio import CapRadio, Radio from weboob.capabilities.collection import CapCollection -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import NihonNoOtoBrowser __all__ = ['NihonNoOtoModule'] -class NihonNoOtoModule(BaseModule, CapRadio, CapCollection): +class NihonNoOtoModule(Module, CapRadio, CapCollection): NAME = 'nihonnooto' MAINTAINER = u'Thomas Lecavelier' EMAIL = 'thomas-weboob@lecavelier.name' diff --git a/modules/nolifetv/module.py b/modules/nolifetv/module.py index bf551d52b1..2afbc30b3b 100644 --- a/modules/nolifetv/module.py +++ b/modules/nolifetv/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection from weboob.tools.value import Value, ValueBackendPassword -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from .browser import NolifeTVBrowser from .video import NolifeTVVideo @@ -31,7 +31,7 @@ __all__ = ['NolifeTVModule'] -class NolifeTVModule(BaseModule, CapVideo, CapCollection): +class NolifeTVModule(Module, CapVideo, CapCollection): NAME = 'nolifetv' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/nova/module.py b/modules/nova/module.py index b7a074471f..a3100d7a18 100644 --- a/modules/nova/module.py +++ b/modules/nova/module.py @@ -24,7 +24,7 @@ from weboob.capabilities.audiostream import BaseAudioStream from weboob.tools.capabilities.streaminfo import StreamInfo from weboob.capabilities.collection import CapCollection -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.browser import StandardBrowser from weboob.tools.parsers import get_parser @@ -32,7 +32,7 @@ __all__ = ['NovaModule'] -class NovaModule(BaseModule, CapRadio, CapCollection): +class NovaModule(Module, CapRadio, CapCollection): NAME = 'nova' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/okc/module.py b/modules/okc/module.py index 695ca7683b..c0872435a2 100644 --- a/modules/okc/module.py +++ b/modules/okc/module.py @@ -27,7 +27,7 @@ from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message, Thread from weboob.capabilities.dating import CapDating, OptimizationNotFound, Event from weboob.capabilities.contact import CapContact, ContactPhoto, Contact, Query, QueryError -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value, ValueBackendPassword from weboob.tools.date import local2utc @@ -63,7 +63,7 @@ def parse_dt(s): return local2utc(d) -class OkCModule(BaseModule, CapMessages, CapContact, CapMessagesPost, CapDating): +class OkCModule(Module, CapMessages, CapContact, CapMessagesPost, CapDating): NAME = 'okc' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/oney/module.py b/modules/oney/module.py index e1c476cf19..76a90d8713 100644 --- a/modules/oney/module.py +++ b/modules/oney/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound from weboob.capabilities.base import find_object -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import OneyBrowser @@ -30,7 +30,7 @@ __all__ = ['OneyModule'] -class OneyModule(BaseModule, CapBank): +class OneyModule(Module, CapBank): NAME = 'oney' MAINTAINER = u'Vincet Paredes' EMAIL = 'vparedes@budget-insight.com' diff --git a/modules/opacwebaloes/module.py b/modules/opacwebaloes/module.py index 2e2924d0fd..e29b7cb23a 100644 --- a/modules/opacwebaloes/module.py +++ b/modules/opacwebaloes/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.library import CapBook -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import AloesBrowser @@ -30,7 +30,7 @@ __all__ = ['AloesModule'] -class AloesModule(BaseModule, CapBook): +class AloesModule(Module, CapBook): NAME = 'opacwebaloes' MAINTAINER = u'Jeremy Monnet' EMAIL = 'jmonnet@gmail.com' diff --git a/modules/opensubtitles/module.py b/modules/opensubtitles/module.py index 5fe8938aa4..67422393e9 100644 --- a/modules/opensubtitles/module.py +++ b/modules/opensubtitles/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported, Subtitle from weboob.applications.suboob.suboob import LANGUAGE_CONV -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import OpensubtitlesBrowser @@ -28,7 +28,7 @@ __all__ = ['OpensubtitlesModule'] -class OpensubtitlesModule(BaseModule, CapSubtitle): +class OpensubtitlesModule(Module, CapSubtitle): NAME = 'opensubtitles' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/orange/module.py b/modules/orange/module.py index 661b5e912b..1993cc2dc2 100644 --- a/modules/orange/module.py +++ b/modules/orange/module.py @@ -22,7 +22,7 @@ from weboob.capabilities.messages import CantSendMessage, CapMessages, CapMessagesPost from weboob.capabilities.account import CapAccount, StatusField -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import OrangeBrowser @@ -31,7 +31,7 @@ __all__ = ['OrangeModule'] -class OrangeModule(BaseModule, CapAccount, CapMessages, CapMessagesPost): +class OrangeModule(Module, CapAccount, CapMessages, CapMessagesPost): NAME = 'orange' MAINTAINER = u'Nicolas Duhamel' EMAIL = 'nicolas@jombi.fr' diff --git a/modules/ouifm/module.py b/modules/ouifm/module.py index b578d2edc3..1124dc777e 100644 --- a/modules/ouifm/module.py +++ b/modules/ouifm/module.py @@ -22,7 +22,7 @@ from weboob.capabilities.audiostream import BaseAudioStream from weboob.tools.capabilities.streaminfo import StreamInfo from weboob.capabilities.collection import CapCollection -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.browser import StandardBrowser from weboob.tools.misc import to_unicode @@ -30,7 +30,7 @@ __all__ = ['OuiFMModule'] -class OuiFMModule(BaseModule, CapRadio, CapCollection): +class OuiFMModule(Module, CapRadio, CapCollection): NAME = 'ouifm' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/ovs/module.py b/modules/ovs/module.py index d9de6ea1a7..5be89f74db 100644 --- a/modules/ovs/module.py +++ b/modules/ovs/module.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.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.browser import BrowserForbidden from weboob.tools.value import Value, ValueBackendPassword from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message @@ -60,7 +60,7 @@ u'zurich': u'Zurich'} -class OvsModule(BaseModule, CapMessages, CapMessagesPost, CapContact): +class OvsModule(Module, CapMessages, CapMessagesPost, CapContact): NAME = 'ovs' DESCRIPTION = u'OnVaSortir website. Handles private messages only' MAINTAINER = u'Vincent A' diff --git a/modules/pap/module.py b/modules/pap/module.py index 8772439529..a8057671b5 100644 --- a/modules/pap/module.py +++ b/modules/pap/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.housing import CapHousing, City, Housing, HousingPhoto -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import PapBrowser @@ -28,7 +28,7 @@ __all__ = ['PapModule'] -class PapModule(BaseModule, CapHousing): +class PapModule(Module, CapHousing): NAME = 'pap' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/pariskiwi/module.py b/modules/pariskiwi/module.py index 958eb6e07b..563fd01cae 100644 --- a/modules/pariskiwi/module.py +++ b/modules/pariskiwi/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.calendar import CapCalendarEvent, BaseCalendarEvent, CATEGORIES, TRANSP, STATUS from datetime import datetime, time @@ -28,7 +28,7 @@ __all__ = ['ParisKiwiModule'] -class ParisKiwiModule(BaseModule, CapCalendarEvent): +class ParisKiwiModule(Module, CapCalendarEvent): NAME = 'pariskiwi' DESCRIPTION = u'ParisKiwi website' MAINTAINER = u'Vincent A' diff --git a/modules/parolesmania/module.py b/modules/parolesmania/module.py index 1d9ff4dd7d..fa82730f4e 100644 --- a/modules/parolesmania/module.py +++ b/modules/parolesmania/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.lyrics import CapLyrics, SongLyrics -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import ParolesmaniaBrowser @@ -27,7 +27,7 @@ __all__ = ['ParolesmaniaModule'] -class ParolesmaniaModule(BaseModule, CapLyrics): +class ParolesmaniaModule(Module, CapLyrics): NAME = 'parolesmania' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/parolesmusique/module.py b/modules/parolesmusique/module.py index 7ed7d7d6fc..64660510bc 100644 --- a/modules/parolesmusique/module.py +++ b/modules/parolesmusique/module.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . from weboob.capabilities.lyrics import CapLyrics, SongLyrics -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import ParolesmusiqueBrowser __all__ = ['ParolesmusiqueModule'] -class ParolesmusiqueModule(BaseModule, CapLyrics): +class ParolesmusiqueModule(Module, CapLyrics): NAME = 'parolesmusique' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/parolesnet/module.py b/modules/parolesnet/module.py index 75a79bf072..1f99b1750f 100644 --- a/modules/parolesnet/module.py +++ b/modules/parolesnet/module.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . from weboob.capabilities.lyrics import CapLyrics, SongLyrics -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import ParolesnetBrowser __all__ = ['ParolesnetModule'] -class ParolesnetModule(BaseModule, CapLyrics): +class ParolesnetModule(Module, CapLyrics): NAME = 'parolesnet' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/pastealacon/module.py b/modules/pastealacon/module.py index 67a63d9333..e0d95d0ae6 100644 --- a/modules/pastealacon/module.py +++ b/modules/pastealacon/module.py @@ -21,13 +21,13 @@ import re from weboob.tools.capabilities.paste import BasePasteModule -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.base import NotLoaded from .browser import PastealaconBrowser, PastealaconPaste -class PastealaconModule(BaseModule, BasePasteModule): +class PastealaconModule(Module, BasePasteModule): NAME = 'pastealacon' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/modules/pastebin/module.py b/modules/pastebin/module.py index 00b882e748..b5195b5d05 100644 --- a/modules/pastebin/module.py +++ b/modules/pastebin/module.py @@ -19,14 +19,14 @@ from weboob.capabilities.base import NotLoaded -from weboob.tools.backend import BackendConfig, BaseModule +from weboob.tools.backend import BackendConfig, Module from weboob.tools.capabilities.paste import BasePasteModule from weboob.tools.value import Value, ValueBackendPassword from .browser import PastebinBrowser, PastebinPaste -class PastebinModule(BaseModule, BasePasteModule): +class PastebinModule(Module, BasePasteModule): NAME = 'pastebin' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/modules/paypal/module.py b/modules/paypal/module.py index e23ebe1d1b..ddfbff98ab 100644 --- a/modules/paypal/module.py +++ b/modules/paypal/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Paypal @@ -28,7 +28,7 @@ __all__ = ['PaypalModule'] -class PaypalModule(BaseModule, CapBank): +class PaypalModule(Module, CapBank): NAME = 'paypal' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/modules/phpbb/module.py b/modules/phpbb/module.py index 1fafa8b62c..fa9d811016 100644 --- a/modules/phpbb/module.py +++ b/modules/phpbb/module.py @@ -20,7 +20,7 @@ -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.newsfeed import Newsfeed from weboob.tools.value import Value, ValueInt, ValueBackendPassword from weboob.tools.misc import limit @@ -33,7 +33,7 @@ __all__ = ['PhpBBModule'] -class PhpBBModule(BaseModule, CapMessages, CapMessagesPost): +class PhpBBModule(Module, CapMessages, CapMessagesPost): NAME = 'phpbb' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/piratebay/module.py b/modules/piratebay/module.py index f7feb77870..8e175d9bda 100644 --- a/modules/piratebay/module.py +++ b/modules/piratebay/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.torrent import CapTorrent, MagnetOnly, Torrent -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value from weboob.capabilities.base import NotAvailable @@ -28,7 +28,7 @@ __all__ = ['PiratebayModule'] -class PiratebayModule(BaseModule, CapTorrent): +class PiratebayModule(Module, CapTorrent): NAME = 'piratebay' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/pixtoilelibre/module.py b/modules/pixtoilelibre/module.py index a388bfa34d..dff20df29c 100644 --- a/modules/pixtoilelibre/module.py +++ b/modules/pixtoilelibre/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.paste import CapPaste, BasePaste from weboob.tools.capabilities.paste import image_mime import re @@ -35,7 +35,7 @@ def id2url(cls, id): return 'http://pix.toile-libre.org/?img=%s' % id -class PixtoilelibreModule(BaseModule, CapPaste): +class PixtoilelibreModule(Module, CapPaste): NAME = 'pixtoilelibre' DESCRIPTION = u'toile-libre image hosting website' MAINTAINER = u'Vincent A' diff --git a/modules/podnapisi/module.py b/modules/podnapisi/module.py index 243cf5d480..0369a8ad3c 100644 --- a/modules/podnapisi/module.py +++ b/modules/podnapisi/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported, Subtitle from weboob.applications.suboob.suboob import LANGUAGE_CONV -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import PodnapisiBrowser @@ -28,7 +28,7 @@ __all__ = ['PodnapisiModule'] -class PodnapisiModule(BaseModule, CapSubtitle): +class PodnapisiModule(Module, CapSubtitle): NAME = 'podnapisi' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/poivy/module.py b/modules/poivy/module.py index 84ce9bd767..a664fa7c85 100644 --- a/modules/poivy/module.py +++ b/modules/poivy/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.bill import CapBill, Subscription, SubscriptionNotFound, Detail from weboob.capabilities.base import find_object -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import PoivyBrowser @@ -29,7 +29,7 @@ __all__ = ['PoivyModule'] -class PoivyModule(BaseModule, CapBill): +class PoivyModule(Module, CapBill): NAME = 'poivy' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/popolemploi/module.py b/modules/popolemploi/module.py index 3316161fc6..1d240f774c 100644 --- a/modules/popolemploi/module.py +++ b/modules/popolemploi/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.job import CapJob from weboob.tools.value import Value from weboob.tools.ordereddict import OrderedDict @@ -29,7 +29,7 @@ __all__ = ['PopolemploiModule'] -class PopolemploiModule(BaseModule, CapJob): +class PopolemploiModule(Module, CapJob): NAME = 'popolemploi' DESCRIPTION = u'Pole Emploi website' MAINTAINER = u'Bezleputh' diff --git a/modules/prixcarburants/module.py b/modules/prixcarburants/module.py index fd0e302107..ea63e2b4d4 100644 --- a/modules/prixcarburants/module.py +++ b/modules/prixcarburants/module.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.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value from weboob.capabilities.pricecomparison import CapPriceComparison, Price, Product @@ -27,7 +27,7 @@ __all__ = ['PrixCarburantsModule'] -class PrixCarburantsModule(BaseModule, CapPriceComparison): +class PrixCarburantsModule(Module, CapPriceComparison): NAME = 'prixcarburants' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/quvi/module.py b/modules/quvi/module.py index 61625ec128..8522f368ce 100644 --- a/modules/quvi/module.py +++ b/modules/quvi/module.py @@ -28,7 +28,7 @@ from weboob.capabilities.base import UserError, StringField from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.image import BaseImage -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.misc import to_unicode from quvi import LibQuvi, QuviError @@ -37,7 +37,7 @@ __all__ = ['QuviModule', 'QuviVideo'] -class QuviModule(BaseModule, CapVideo): +class QuviModule(Module, CapVideo): NAME = 'quvi' DESCRIPTION = u'Multi-website video helper with quvi. Handles Youtube, BBC, and a lot more' MAINTAINER = u'Vincent A' diff --git a/modules/radiofrance/module.py b/modules/radiofrance/module.py index 143f29aec7..69eb3bdd78 100644 --- a/modules/radiofrance/module.py +++ b/modules/radiofrance/module.py @@ -25,7 +25,7 @@ from weboob.capabilities.audiostream import BaseAudioStream from weboob.tools.capabilities.streaminfo import StreamInfo from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import RadioFranceBrowser, RadioFranceVideo @@ -33,7 +33,7 @@ __all__ = ['RadioFranceModule'] -class RadioFranceModule(BaseModule, CapRadio, CapCollection, CapVideo): +class RadioFranceModule(Module, CapRadio, CapCollection, CapVideo): NAME = 'radiofrance' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/modules/razibus/module.py b/modules/razibus/module.py index da8ba78f77..10777c9272 100644 --- a/modules/razibus/module.py +++ b/modules/razibus/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value @@ -29,7 +29,7 @@ __all__ = ['RazibusModule'] -class RazibusModule(BaseModule, CapCalendarEvent): +class RazibusModule(Module, CapCalendarEvent): NAME = 'razibus' DESCRIPTION = u'site annonçant les évènements attendus par les punks a chiens' MAINTAINER = u'Bezleputh' diff --git a/modules/redmine/module.py b/modules/redmine/module.py index 011ca0f12f..3f403e3892 100644 --- a/modules/redmine/module.py +++ b/modules/redmine/module.py @@ -25,7 +25,7 @@ Version, Status, Update, Attachment, \ Query, Change from weboob.capabilities.collection import CapCollection, Collection, CollectionNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.exceptions import BrowserHTTPNotFound from weboob.tools.value import ValueBackendPassword, Value @@ -35,7 +35,7 @@ __all__ = ['RedmineModule'] -class RedmineModule(BaseModule, CapContent, CapBugTracker, CapCollection): +class RedmineModule(Module, CapContent, CapBugTracker, CapCollection): NAME = 'redmine' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/regionsjob/module.py b/modules/regionsjob/module.py index 9977af36f6..d001131ebc 100644 --- a/modules/regionsjob/module.py +++ b/modules/regionsjob/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.job import CapJob, BaseJobAdvert from .browser import RegionsjobBrowser from weboob.tools.ordereddict import OrderedDict @@ -28,7 +28,7 @@ __all__ = ['RegionsjobModule'] -class RegionsjobModule(BaseModule, CapJob): +class RegionsjobModule(Module, CapJob): NAME = 'regionsjob' DESCRIPTION = u'regionsjob website' MAINTAINER = u'Bezleputh' diff --git a/modules/sachsen/module.py b/modules/sachsen/module.py index b334d2ec6b..2b8bc97921 100644 --- a/modules/sachsen/module.py +++ b/modules/sachsen/module.py @@ -21,13 +21,13 @@ from weboob.capabilities.gauge import CapGauge, GaugeSensor, Gauge,\ SensorNotFound from weboob.capabilities.base import find_object -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module __all__ = ['SachsenLevelModule'] -class SachsenLevelModule(BaseModule, CapGauge): +class SachsenLevelModule(Module, CapGauge): NAME = 'sachsen' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/seeklyrics/module.py b/modules/seeklyrics/module.py index e9236ac617..7a1c3e2f97 100644 --- a/modules/seeklyrics/module.py +++ b/modules/seeklyrics/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.lyrics import CapLyrics, SongLyrics -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import SeeklyricsBrowser @@ -27,7 +27,7 @@ __all__ = ['SeeklyricsModule'] -class SeeklyricsModule(BaseModule, CapLyrics): +class SeeklyricsModule(Module, CapLyrics): NAME = 'seeklyrics' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/seloger/module.py b/modules/seloger/module.py index 5d9781e992..2912158fd3 100644 --- a/modules/seloger/module.py +++ b/modules/seloger/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.housing import CapHousing, City, Housing, HousingPhoto -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import SeLogerBrowser @@ -28,7 +28,7 @@ __all__ = ['SeLogerModule'] -class SeLogerModule(BaseModule, CapHousing): +class SeLogerModule(Module, CapHousing): NAME = 'seloger' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/senscritique/module.py b/modules/senscritique/module.py index acd7791de0..78e631faa4 100644 --- a/modules/senscritique/module.py +++ b/modules/senscritique/module.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.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value, ValueBool from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES @@ -28,7 +28,7 @@ __all__ = ['SenscritiqueModule'] -class SenscritiqueModule(BaseModule, CapCalendarEvent): +class SenscritiqueModule(Module, CapCalendarEvent): NAME = 'senscritique' DESCRIPTION = u'senscritique website' MAINTAINER = u'Bezleputh' diff --git a/modules/sfr/module.py b/modules/sfr/module.py index b432c7c9b5..babdf61001 100644 --- a/modules/sfr/module.py +++ b/modules/sfr/module.py @@ -22,7 +22,7 @@ from weboob.capabilities.messages import CantSendMessage, CapMessages, CapMessagesPost from weboob.capabilities.account import CapAccount, StatusField -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value, ValueBackendPassword from .browser import SfrBrowser @@ -31,7 +31,7 @@ __all__ = ['SfrModule'] -class SfrModule(BaseModule, CapAccount, CapMessages, CapMessagesPost): +class SfrModule(Module, CapAccount, CapMessages, CapMessagesPost): NAME = 'sfr' MAINTAINER = u'Christophe Benz' EMAIL = 'christophe.benz@gmail.com' diff --git a/modules/societegenerale/module.py b/modules/societegenerale/module.py index e3c1514ebd..04af6d335a 100644 --- a/modules/societegenerale/module.py +++ b/modules/societegenerale/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value, ValueBackendPassword from .browser import SocieteGenerale @@ -30,7 +30,7 @@ __all__ = ['SocieteGeneraleModule'] -class SocieteGeneraleModule(BaseModule, CapBank): +class SocieteGeneraleModule(Module, CapBank): NAME = 'societegenerale' MAINTAINER = u'Jocelyn Jaubert' EMAIL = 'jocelyn.jaubert@gmail.com' diff --git a/modules/somafm/module.py b/modules/somafm/module.py index 11eead01db..986a2c3486 100644 --- a/modules/somafm/module.py +++ b/modules/somafm/module.py @@ -23,7 +23,7 @@ from weboob.capabilities.audiostream import BaseAudioStream from weboob.tools.capabilities.streaminfo import StreamInfo from weboob.capabilities.collection import CapCollection -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.browser import StandardBrowser from weboob.tools.parsers.iparser import IParser @@ -36,7 +36,7 @@ def parse(self, data, encoding=None): return lxml.etree.fromstring(data.read()) -class SomaFMModule(BaseModule, CapRadio, CapCollection): +class SomaFMModule(Module, CapRadio, CapCollection): NAME = 'somafm' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/sueurdemetal/module.py b/modules/sueurdemetal/module.py index 23454b978c..a89ea23310 100644 --- a/modules/sueurdemetal/module.py +++ b/modules/sueurdemetal/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.calendar import CapCalendarEvent, BaseCalendarEvent, CATEGORIES, TRANSP, STATUS import datetime @@ -34,7 +34,7 @@ def id2url(cls, _id): return 'http://www.sueurdemetal.com/detail-concert-metal.php?c=%s' % _id -class SueurDeMetalModule(BaseModule, CapCalendarEvent): +class SueurDeMetalModule(Module, CapCalendarEvent): NAME = 'sueurdemetal' DESCRIPTION = u'SueurDeMetal French concerts list website' MAINTAINER = u'Vincent A' diff --git a/modules/supertoinette/module.py b/modules/supertoinette/module.py index fe0f7d07c9..bfaf4a2694 100644 --- a/modules/supertoinette/module.py +++ b/modules/supertoinette/module.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import SupertoinetteBrowser __all__ = ['SupertoinetteModule'] -class SupertoinetteModule(BaseModule, CapRecipe): +class SupertoinetteModule(Module, CapRecipe): NAME = 'supertoinette' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/tinder/module.py b/modules/tinder/module.py index 39ee1a6f05..bf2349dce8 100644 --- a/modules/tinder/module.py +++ b/modules/tinder/module.py @@ -23,7 +23,7 @@ from weboob.capabilities.messages import CapMessages, CapMessagesPost, Thread, Message from weboob.capabilities.dating import CapDating, Optimization -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value, ValueBackendPassword from weboob.tools.log import getLogger @@ -65,7 +65,7 @@ def view_profile(self): self.view_cron = self.sched.schedule(1, self.view_profile) -class TinderModule(BaseModule, CapMessages, CapMessagesPost, CapDating): +class TinderModule(Module, CapMessages, CapMessagesPost, CapDating): NAME = 'tinder' DESCRIPTION = u'Tinder dating mobile application' MAINTAINER = u'Roger Philibert' diff --git a/modules/transilien/module.py b/modules/transilien/module.py index 22f98f2d27..b1893449d0 100644 --- a/modules/transilien/module.py +++ b/modules/transilien/module.py @@ -19,12 +19,12 @@ # along with weboob. If not, see . from weboob.capabilities.travel import CapTravel -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import Transilien -class TransilienModule(BaseModule, CapTravel): +class TransilienModule(Module, CapTravel): NAME = 'transilien' MAINTAINER = u'Julien Hébert' EMAIL = 'juke@free.fr' diff --git a/modules/trictractv/module.py b/modules/trictractv/module.py index e864da49e1..fca9783b0f 100644 --- a/modules/trictractv/module.py +++ b/modules/trictractv/module.py @@ -22,7 +22,7 @@ from weboob.capabilities.video import CapVideo -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import TricTracTVBrowser from .video import TricTracTVVideo @@ -31,7 +31,7 @@ __all__ = ['TricTracTVModule'] -class TricTracTVModule(BaseModule, CapVideo): +class TricTracTVModule(Module, CapVideo): NAME = 'trictractv' MAINTAINER = u'Benjamin Drieu' EMAIL = 'benjamin@drieu.org' diff --git a/modules/tvsubtitles/module.py b/modules/tvsubtitles/module.py index e5d668d2ff..20fd6e8968 100644 --- a/modules/tvsubtitles/module.py +++ b/modules/tvsubtitles/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import TvsubtitlesBrowser, LANGUAGE_LIST @@ -27,7 +27,7 @@ __all__ = ['TvsubtitlesModule'] -class TvsubtitlesModule(BaseModule, CapSubtitle): +class TvsubtitlesModule(Module, CapSubtitle): NAME = 'tvsubtitles' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/twitter/module.py b/modules/twitter/module.py index bb56fae944..cc35448e50 100644 --- a/modules/twitter/module.py +++ b/modules/twitter/module.py @@ -19,7 +19,7 @@ from datetime import datetime, timedelta from weboob.tools.value import Value, ValueBackendPassword -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.capabilities.messages import CapMessages, Thread, CapMessagesPost from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection from weboob.capabilities.base import find_object @@ -30,7 +30,7 @@ __all__ = ['TwitterModule'] -class TwitterModule(BaseModule, CapMessages, CapMessagesPost, CapCollection): +class TwitterModule(Module, CapMessages, CapMessagesPost, CapCollection): NAME = 'twitter' DESCRIPTION = u'twitter website' MAINTAINER = u'Bezleputh' diff --git a/modules/unsee/module.py b/modules/unsee/module.py index 9d7229c57a..69b4757005 100644 --- a/modules/unsee/module.py +++ b/modules/unsee/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.paste import BasePaste from weboob.tools.capabilities.paste import BasePasteModule from weboob.tools.capabilities.paste import image_mime @@ -36,7 +36,7 @@ def id2url(cls, id): return 'https://unsee.cc/%s' % id -class UnseeModule(BaseModule, BasePasteModule): +class UnseeModule(Module, BasePasteModule): NAME = 'unsee' DESCRIPTION = u'unsee.cc expiring image hosting' MAINTAINER = u'Vincent A' diff --git a/modules/ups/module.py b/modules/ups/module.py index e8a87b5656..a2289d7444 100644 --- a/modules/ups/module.py +++ b/modules/ups/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.parcel import CapParcel -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import UpsBrowser @@ -27,7 +27,7 @@ __all__ = ['UpsModule'] -class UpsModule(BaseModule, CapParcel): +class UpsModule(Module, CapParcel): NAME = 'ups' DESCRIPTION = u'UPS website' MAINTAINER = u'Romain Bignon' diff --git a/modules/vimeo/module.py b/modules/vimeo/module.py index 556e9ccb91..85658b51d8 100644 --- a/modules/vimeo/module.py +++ b/modules/vimeo/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.collection import CapCollection, CollectionNotFound from .browser import VimeoBrowser @@ -30,7 +30,7 @@ __all__ = ['VimeoModule'] -class VimeoModule(BaseModule, CapVideo, CapCollection): +class VimeoModule(Module, CapVideo, CapCollection): NAME = 'vimeo' MAINTAINER = u'François Revol' EMAIL = 'revol@free.fr' diff --git a/modules/vlille/module.py b/modules/vlille/module.py index aa404416d8..3592575c49 100644 --- a/modules/vlille/module.py +++ b/modules/vlille/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . import re -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.base import find_object from weboob.capabilities.gauge import CapGauge, GaugeSensor, Gauge, SensorNotFound @@ -27,7 +27,7 @@ __all__ = ['VlilleModule'] -class VlilleModule(BaseModule, CapGauge): +class VlilleModule(Module, CapGauge): NAME = 'vlille' DESCRIPTION = u'access to vlille datas' MAINTAINER = u'Bezleputh' diff --git a/modules/voyagessncf/module.py b/modules/voyagessncf/module.py index 4c1e1b6023..53d00ac312 100644 --- a/modules/voyagessncf/module.py +++ b/modules/voyagessncf/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value from weboob.capabilities.travel import CapTravel, Station, Departure @@ -30,7 +30,7 @@ __all__ = ['VoyagesSNCFModule'] -class VoyagesSNCFModule(BaseModule, CapTravel): +class VoyagesSNCFModule(Module, CapTravel): NAME = 'voyagessncf' DESCRIPTION = u'Voyages SNCF' MAINTAINER = u'Romain Bignon' diff --git a/modules/weather/module.py b/modules/weather/module.py index 0303ba67fd..7716170e77 100644 --- a/modules/weather/module.py +++ b/modules/weather/module.py @@ -19,14 +19,14 @@ from weboob.capabilities.weather import CapWeather -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import WeatherBrowser __all__ = ['WeatherModule'] -class WeatherModule(BaseModule, CapWeather): +class WeatherModule(Module, CapWeather): NAME = 'weather' MAINTAINER = u'Arno Renevier' EMAIL = 'arno@renevier.net' diff --git a/modules/wellsfargo/module.py b/modules/wellsfargo/module.py index 53cbc3e066..4ff0b196ff 100644 --- a/modules/wellsfargo/module.py +++ b/modules/wellsfargo/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import WellsFargo @@ -28,7 +28,7 @@ __all__ = ['WellsFargoModule'] -class WellsFargoModule(BaseModule, CapBank): +class WellsFargoModule(Module, CapBank): NAME = 'wellsfargo' MAINTAINER = u'Oleg Plakhotniuk' EMAIL = 'olegus8@gmail.com' diff --git a/modules/wordreference/module.py b/modules/wordreference/module.py index d4bc5de346..5fe316d94b 100644 --- a/modules/wordreference/module.py +++ b/modules/wordreference/module.py @@ -20,7 +20,7 @@ from weboob.capabilities.translate import CapTranslate, Translation, TranslationFail, LanguageNotSupported -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import WordReferenceBrowser @@ -28,7 +28,7 @@ __all__ = ['WordReferenceModule'] -class WordReferenceModule(BaseModule, CapTranslate): +class WordReferenceModule(Module, CapTranslate): MAINTAINER = u'Lucien Loiseau' EMAIL = 'loiseau.lucien@gmail.com' VERSION = '1.0' diff --git a/modules/yahoo/module.py b/modules/yahoo/module.py index 53fafbdaa8..fdfcb10d95 100644 --- a/modules/yahoo/module.py +++ b/modules/yahoo/module.py @@ -23,14 +23,14 @@ from weboob.capabilities.weather import CapWeather, CityNotFound, Current, Forecast, City -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.browser import StandardBrowser __all__ = ['YahooModule'] -class YahooModule(BaseModule, CapWeather): +class YahooModule(Module, CapWeather): NAME = 'yahoo' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/youjizz/module.py b/modules/youjizz/module.py index 3d62ea405f..bf6f3fedaf 100644 --- a/modules/youjizz/module.py +++ b/modules/youjizz/module.py @@ -22,7 +22,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import YoujizzBrowser @@ -30,7 +30,7 @@ __all__ = ['YoujizzModule'] -class YoujizzModule(BaseModule, CapVideo, CapCollection): +class YoujizzModule(Module, CapVideo, CapCollection): NAME = 'youjizz' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/youporn/module.py b/modules/youporn/module.py index be5691f25e..322948ae49 100644 --- a/modules/youporn/module.py +++ b/modules/youporn/module.py @@ -21,7 +21,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.capabilities.collection import CapCollection, CollectionNotFound from .browser import YoupornBrowser @@ -31,7 +31,7 @@ __all__ = ['YoupornModule'] -class YoupornModule(BaseModule, CapVideo, CapCollection): +class YoupornModule(Module, CapVideo, CapCollection): NAME = 'youporn' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/youtube/module.py b/modules/youtube/module.py index 757a00eebb..d17a75cd80 100644 --- a/modules/youtube/module.py +++ b/modules/youtube/module.py @@ -33,7 +33,7 @@ from weboob.capabilities.image import BaseImage from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseModule, BackendConfig +from weboob.tools.backend import Module, BackendConfig from weboob.tools.misc import to_unicode from weboob.tools.value import ValueBackendPassword, Value @@ -44,7 +44,7 @@ __all__ = ['YoutubeModule'] -class YoutubeModule(BaseModule, CapVideo, CapCollection): +class YoutubeModule(Module, CapVideo, CapCollection): NAME = 'youtube' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/tools/boilerplate_data/base_module.py b/tools/boilerplate_data/base_module.py index 9b246cbe1e..1de709d9fd 100644 --- a/tools/boilerplate_data/base_module.py +++ b/tools/boilerplate_data/base_module.py @@ -1,5 +1,5 @@ <%inherit file="layout.py"/> -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from .browser import ${r.classname}Browser @@ -7,7 +7,7 @@ __all__ = ['${r.classname}Module'] -class ${r.classname}Module(BaseModule): +class ${r.classname}Module(Module): NAME = '${r.name}' DESCRIPTION = u'${r.name} website' MAINTAINER = u'${r.author}' diff --git a/tools/boilerplate_data/cap_backend.py b/tools/boilerplate_data/cap_backend.py index 59242900a5..91bfbbeac7 100644 --- a/tools/boilerplate_data/cap_backend.py +++ b/tools/boilerplate_data/cap_backend.py @@ -1,5 +1,5 @@ <%inherit file="layout.py"/> -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from ${r.capmodulename} import ${r.capname} from .browser import ${r.classname}Browser @@ -8,7 +8,7 @@ __all__ = ['${r.classname}Module'] -class ${r.classname}Module(BaseModule, ${r.capname}): +class ${r.classname}Module(Module, ${r.capname}): NAME = '${r.name}' DESCRIPTION = u'${r.name} website' MAINTAINER = u'${r.author}' diff --git a/weboob/capabilities/base.py b/weboob/capabilities/base.py index db6ce7d58e..aa8c537b3d 100644 --- a/weboob/capabilities/base.py +++ b/weboob/capabilities/base.py @@ -127,7 +127,7 @@ class NotLoadedType(object): """ NotLoaded is a constant to use on not loaded fields. - When you use :func:`weboob.tools.backend.BaseModule.fillobj` on a object based on :class:`BaseObject`, + When you use :func:`weboob.tools.backend.Module.fillobj` on a object based on :class:`BaseObject`, it will request all fields with this value. """ diff --git a/weboob/core/bcall.py b/weboob/core/bcall.py index 8b56a07b30..5ed0cdadc3 100644 --- a/weboob/core/bcall.py +++ b/weboob/core/bcall.py @@ -50,7 +50,7 @@ class BackendsCall(object): def __init__(self, backends, function, *args, **kwargs): """ :param backends: List of backends to call - :type backends: list[:class:`BaseModule`] + :type backends: list[:class:`Module`] :param function: backends' method name, or callable object. :type function: :class:`str` or :class:`callable` """ diff --git a/weboob/core/modules.py b/weboob/core/modules.py index c297c49160..25ad21646b 100644 --- a/weboob/core/modules.py +++ b/weboob/core/modules.py @@ -21,11 +21,11 @@ import imp import logging -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.log import getLogger -__all__ = ['Module', 'ModulesLoader', 'RepositoryModulesLoader', 'ModuleLoadError'] +__all__ = ['LoadedModule', 'ModulesLoader', 'RepositoryModulesLoader', 'ModuleLoadError'] class ModuleLoadError(Exception): @@ -34,17 +34,17 @@ def __init__(self, module_name, msg): self.module = module_name -class Module(object): +class LoadedModule(object): def __init__(self, package): self.logger = getLogger('backend') self.package = package self.klass = None for attrname in dir(self.package): attr = getattr(self.package, attrname) - if isinstance(attr, type) and issubclass(attr, BaseModule) and attr != BaseModule: + if isinstance(attr, type) and issubclass(attr, Module) and attr != Module: self.klass = attr if not self.klass: - raise ImportError('%s is not a backend (no BaseModule class found)' % package) + raise ImportError('%s is not a backend (no Module class found)' % package) @property def name(self): @@ -143,7 +143,7 @@ def load_module(self, module_name): try: fp, pathname, description = imp.find_module(module_name, [path]) try: - module = Module(imp.load_module(module_name, fp, pathname, description)) + module = LoadedModule(imp.load_module(module_name, fp, pathname, description)) finally: if fp: fp.close() diff --git a/weboob/core/ouiboube.py b/weboob/core/ouiboube.py index 46e8d64ab0..4c58ea2e4e 100644 --- a/weboob/core/ouiboube.py +++ b/weboob/core/ouiboube.py @@ -25,7 +25,7 @@ from weboob.core.backendscfg import BackendsConfig from weboob.core.repositories import Repositories, IProgress from weboob.core.scheduler import Scheduler -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.config.iconfig import ConfigError from weboob.tools.log import getLogger @@ -97,7 +97,7 @@ def build_backend(self, module_name, params=None, storage=None, name=None): :type storage: :class:`weboob.tools.storage.IStorage` :param name: name of backend :type name: :class:`basestring` - :rtype: :class:`weboob.tools.backend.BaseModule` + :rtype: :class:`weboob.tools.backend.Module` """ module = self.modules_loader.get_or_load_module(module_name) @@ -127,7 +127,7 @@ def load_backend(self, module_name, name, params=None, storage=None): :type params: :class:`dict` :param storage: storage to use :type storage: :class:`weboob.tools.storage.IStorage` - :rtype: :class:`weboob.tools.backend.BaseModule` + :rtype: :class:`weboob.tools.backend.Module` """ if name is None: name = module_name @@ -192,7 +192,7 @@ def iter_backends(self, caps=None): :param caps: optional list of capabilities to select backends :type caps: tuple[:class:`weboob.capabilities.base.CapBase`] - :rtype: iter[:class:`weboob.tools.backend.BaseModule`] + :rtype: iter[:class:`weboob.tools.backend.Module`] """ for _, backend in sorted(self.backend_instances.iteritems()): if caps is None or backend.has_caps(caps): @@ -228,7 +228,7 @@ def do(self, function, *args, **kwargs): backends = self.backend_instances.values() _backends = kwargs.pop('backends', None) if _backends is not None: - if isinstance(_backends, BaseModule): + if isinstance(_backends, Module): backends = [_backends] elif isinstance(_backends, basestring): if len(_backends) > 0: @@ -376,7 +376,7 @@ def build_backend(self, module_name, params=None, storage=None, name=None): :type storage: :class:`weboob.tools.storage.IStorage` :param name: name of backend :type name: :class:`basestring` - :rtype: :class:`weboob.tools.backend.BaseModule` + :rtype: :class:`weboob.tools.backend.Module` """ minfo = self.repositories.get_module_info(module_name) if minfo is None: @@ -404,7 +404,7 @@ def load_backends(self, caps=None, names=None, modules=None, exclude=None, stora :param errors: if specified, store every errors in this list :type errors: list[:class:`LoadError`] :returns: loaded backends - :rtype: dict[:class:`str`, :class:`weboob.tools.backend.BaseModule`] + :rtype: dict[:class:`str`, :class:`weboob.tools.backend.Module`] """ loaded = {} if storage is None: @@ -446,7 +446,7 @@ def load_backends(self, caps=None, names=None, modules=None, exclude=None, stora try: backend_instance = module.create_instance(self, instance_name, params, storage) - except BaseModule.ConfigError as e: + except Module.ConfigError as e: if errors is not None: errors.append(self.LoadError(instance_name, e)) else: diff --git a/weboob/core/repositories.py b/weboob/core/repositories.py index 44c8adb940..06fa8144c4 100644 --- a/weboob/core/repositories.py +++ b/weboob/core/repositories.py @@ -32,7 +32,7 @@ from io import BytesIO from weboob.tools.exceptions import BrowserHTTPError, BrowserHTTPNotFound -from .modules import Module +from .modules import LoadedModule from weboob.tools.log import getLogger from weboob.tools.misc import to_unicode try: @@ -281,7 +281,7 @@ def build_index(self, path, filename): try: fp, pathname, description = imp.find_module(name, [path]) try: - module = Module(imp.load_module(name, fp, pathname, description)) + module = LoadedModule(imp.load_module(name, fp, pathname, description)) finally: if fp: fp.close() diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py index f2a844ff49..939de884a0 100644 --- a/weboob/tools/backend.py +++ b/weboob/tools/backend.py @@ -29,7 +29,7 @@ from weboob.tools.value import ValuesDict -__all__ = ['BackendStorage', 'BackendConfig', 'BaseModule'] +__all__ = ['BackendStorage', 'BackendConfig', 'Module'] class BackendStorage(object): @@ -37,8 +37,8 @@ class BackendStorage(object): This is an abstract layer to store data in storages (:mod:`weboob.tools.storage`) easily. - It is instancied automatically in constructor of :class:`BaseModule`, in the - :attr:`BaseModule.storage` attribute. + It is instancied automatically in constructor of :class:`Module`, in the + :attr:`Module.storage` attribute. :param name: name of backend :param storage: storage object @@ -156,7 +156,7 @@ def load(self, weboob, modname, instname, config, nofail=False): if value is None: if not nofail and field.required: - raise BaseModule.ConfigError('Backend(%s): Configuration error: Missing parameter "%s" (%s)' + raise Module.ConfigError('Backend(%s): Configuration error: Missing parameter "%s" (%s)' % (cfg.instname, name, field.description)) value = field.default @@ -165,7 +165,7 @@ def load(self, weboob, modname, instname, config, nofail=False): field.load(cfg.instname, value, cfg.weboob.callbacks) except ValueError as v: if not nofail: - raise BaseModule.ConfigError( + raise Module.ConfigError( 'Backend(%s): Configuration error for field "%s": %s' % (cfg.instname, name, v)) cfg[name] = field @@ -202,7 +202,7 @@ def save(self, edit=True, params=None): self.weboob.backends_config.add_backend(self.instname, self.modname, dump, edit) -class BaseModule(object): +class Module(object): """ Base class for backends. diff --git a/weboob/tools/capabilities/gallery/genericcomicreader.py b/weboob/tools/capabilities/gallery/genericcomicreader.py index fa9c00515e..a0fa855af2 100644 --- a/weboob/tools/capabilities/gallery/genericcomicreader.py +++ b/weboob/tools/capabilities/gallery/genericcomicreader.py @@ -22,7 +22,7 @@ import re from weboob.capabilities.gallery import CapGallery, BaseGallery, BaseImage -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.browser import BaseBrowser, BasePage __all__ = ['GenericComicReaderModule'] @@ -63,7 +63,7 @@ def fill_image(self, image, fields): image.data = self.readurl(image.url) -class GenericComicReaderModule(BaseModule, CapGallery): +class GenericComicReaderModule(Module, CapGallery): NAME = 'genericcomicreader' MAINTAINER = u'Noé Rubinstein' EMAIL = 'noe.rubinstein@gmail.com' diff --git a/weboob/tools/capabilities/messages/GenericModule.py b/weboob/tools/capabilities/messages/GenericModule.py index cdc0cdc570..dc6e0788f3 100644 --- a/weboob/tools/capabilities/messages/GenericModule.py +++ b/weboob/tools/capabilities/messages/GenericModule.py @@ -21,11 +21,11 @@ import time from weboob.capabilities.messages import CapMessages, Message, Thread from weboob.capabilities.base import find_object -from weboob.tools.backend import BaseModule +from weboob.tools.backend import Module from weboob.tools.newsfeed import Newsfeed -class GenericNewspaperModule(BaseModule, CapMessages): +class GenericNewspaperModule(Module, CapMessages): """ GenericNewspaperModule class """ -- GitLab