diff --git a/docs/source/guides/module.rst b/docs/source/guides/module.rst index 01b468d64c3d9b15542dbfae884edb29280b444e..87e9b3c6d92cb47dc946a442e76e41d22a1a787f 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 6a6d045db2ce2df4d64fb2c1ccca4d06c97448fb..2e284fb6a632677ef0d6f24c5385c3937b782850 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 2687ed74625f3e2f688e3408efdd8144a3c439a0..8c463c73c5ae4deb4c678e6dde520781ceb305b8 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 f68f71aebffcd4bf4e68c8d763e92bb6aff9edff..565d97d42b0a70b2ebeff47352a0feb4eaa60c93 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 b816607252d7c7bccf91b787074a267765d89c30..6c32f178c000404dba5c3825de3fb50dc3387131 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 90583bc37c5aa918977063887e81d31eb0cd7887..89aae4ab9b1b92e1683e0acafaa7798cdc1a5e28 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 d94317bafd3ecc67fcf2d7908b810de32f7caeb2..f97ca0d19645b98a3ac9f15c7b06886dda366f1a 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 fcb7ca8fd0ac13beeb0c6cca0991ebcae2584356..c1592585f2beb15f0d16b79d736867e9ff1d818b 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 2b0d5d033cf0b8308d4ba4137374cd7880cff907..9d5f44d5d45de9b8454919388d9e1586340d1d9f 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 9ea18e8a532ac7798cb7b2144dcda9e7e1b8696f..2bd42a7fe0caa56a0c2d74abab8dfa771930e76d 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 e8cb6540bad6ea5c666a91a18fb7bd2abf1c87bc..d027e32d9c16e5d78a62f66aeca6dc29fc5cd900 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 76a6d4015ae26f11156ecb3ca9523b8cbf4f0093..c1ec58a45875a535db134caca2364f3a60664187 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 c7490a375ba977e46af41ba9fdfd92457042bfa6..56724147d56c089fda1a743a18de53ddd2fd1e04 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 75cc094b6171975f2c62f34c162b1bb22f6a2cbb..e85383d29728528c6da39f206e011597b8e4c1ec 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 76b8ed583fa935e5801623269a5c227c3a16b3e4..fc638467644ff7dd0717bf248f10d4bf4d6b5d8b 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 bdf133304ba4ade7973ccf7d555259b5807cb0bc..dc561e7a560b897f6c9b7aa7808082f43473f7b8 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 3857fbaf2130b89bb29698adb98a9500a754995d..3dd23528f405da95d1440afd93cdc0a5cad7082c 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 9242acb5fa9d3bc82c64a7cbb58e2f635cc7b307..2ef255d0d1b2e0861336bb129cc2ecd7c69dfbf1 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 5689308087417ebae19bd88e8a50e401e05ba782..c9d68e1be4eee59e8091100fd4ca35c90f002d7a 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 93ec4aa468c618f74fa54b9b24eafd39c22bc2e6..abfe8da63298b25b2ed1e01e5f6c700a0f7d4467 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 8edd74f1c8734d53505be710da6bd4568ae56260..5706a08c8662344164cffc7f72d747579d75843c 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 3134957860e9c3ee560ccda0cae82fef7f495c8b..f08262eb5b4615eb22d2b95c686f19144c933163 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 f22c55e29284934ebe352331aaeba6aaeb903b7c..78f26a44e8760f37f91a55826064d4d1d38d0eb5 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 a8c02e882f74fee52d0cbfc30d33f67542df49e4..c72385f4904c77ecbe0b3dd6c0e3bdce84500d46 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 40957890664b1a8c436934205d7fe02f86f52716..87567303d464d0f9849c8e24b544bd8011080909 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 35ff07e3cd15263922954fa6e4e28e1375d5951b..e286cdfd0747d65a50652509cb25eb1df556b8ea 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 1cf61973b028d3c1c73e0a05ede276581ab13fc2..73da2bd74e9e24291e28c74b9ecbc7a5bf8d8382 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 db502fe400f1bed529286812e671bb353b7cdc6d..bc2cfe432a43fe66e7d74d7108220ddd097c8652 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 51fc77feb211c9b150adffe27206ade40762d38d..0975efb58f6cd394c8ea2bc3c1bde6d8bbb73088 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 ce46d61286d042b4cf786897ec2dd0c33242b66a..b0a21638811c06a8bf979d0e7a69429a6ffb5157 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 e7ecb66e3480e5067d48b51f44c2b313f700e0a0..2ae2754cc23b3202fb2537312847cf0df474ce86 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 fdeda7b8d4b40474bb63ef33d24344347b331110..c2e2443c952ded60b4a1ee64b2c2d65c1e13921c 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 b72c00e95005ef81bab94ba6668fd726c08d7e46..17574daa72f3d77f8c2cae566bd7b4c9c1fac263 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 33f392477d3e4a8778f1e0cda123d441cd594705..3fc7013b72a3021e00d9ff7113834b46028d2c8a 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 8842f790a51ffdab4d7ed100877dbd3331d12af8..31542f69d21988edbd0dd36ccef5e7cb612681eb 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 072554d4d9984cbf059b5f397204bec0d8a2f95b..991b1cdf971201f25e78336af664a2daca79b9b4 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 e0299ab12c66e41a6809d88921c45a09df7ad1d6..4d2c5ca61b6b3537db44ea303bb63793bb44f4cb 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 0a37e798f8073edf3670c3f4b60e5529118c70dc..18548a905304697f628df2aefa8588458a1a4a58 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 49b93c3495d0ad8ab772363d39491fb45a134a96..1d5ac0466511dde2e37169ab0bc3753932aa41a5 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 f1dabec6ee8cd1cf5c6111d1f580490bb867710e..51840968daddfd8391dafb88d30b25f681b8905b 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 6d54b46a220826828e8401fbfeb5e3926ace24b1..51db9acb1c916fa73daad67d535ec31e3825ff4b 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 c66565e75bab69fffa66703f0e098de186639631..33125ff0f1ac0f1989443dfeacb05fbd2a76a1ee 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 0ebdc00a5d634dd8b6bbd04e398866c1222381d8..3791ed8a976adf52f16b851b7a1f392d946c5f3e 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 96ea72449c8ebfcbe53b5713428e33ad1e7dae42..7c49fa1311e17cca2ba05cb753091de843d2b051 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 aedece5cbcbf880921cd1864265050ba440187ae..dcc68abc0fcc774c31fac94a052788f2986d2b90 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 42309e5c395d9e615f8da808a276a170a20a9a1b..ecb3a1ce2997ae5bbb5837ddb8c6d9d4f12d1040 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 0eb91d0296482035f7228017e7673b080664e75e..2bdcfed56a6844b2416a82e5754e3ecb7ed4293e 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 c8ba9a93b98ab578bbf5b9eabc5e89926162e55a..ba09aaf4116faf8b25fb470f358ea789eec4632c 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 14e49be404449f52d84cc56dc894c2994cdd1117..b122e786387f94763317ab9cc7f6e64c0e06573d 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 c63c35817c090b992208812b9c3fab35de021d1e..359c2ba4d58d419739ef43b6e89e83b3e919add6 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 4ac1d0e6f22bbe5283069f6292fa06975781b7f4..5ddbb1c9a887dbd60835f4332c0cd5eb788bca6f 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 163c3d30e9980f692c4d0c4b80691908d37fdcda..65c2cc16f05191fbca4d4b35cb4b0cdd5bebc30b 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 c914a22c765f45f90e49e0f29ad2d15dd7b0a5f7..94a7250ccc5b7c6667da733bfdb9c878a5d8394d 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 52011875999df5fde3b9bc2e5029f7363a83c0e8..1847d0d5e09386dc356fb67d6f073493dcab059c 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 c080e0b5b9bdf52e36d302b11e13dbf7eea67c1d..839961969e9cd7473fa37b70716f73135d067270 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 338e05df0cd51e4ce58fbded7718788ef0b742eb..1749c696ec2e1912f16c7c7511a4159fd57abf5a 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 08a037c672fb1162051300b5cbd17909effb1c6d..7e28b01a9f238f60c556206c81d0eeff44ae47b8 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 8700180038d97424faef2f44c3f6730c55a0c46d..b561eca25f1fc69d95ee898a3f914aec4febc16e 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 f664f0f795a6be64033e2f73ccfd0ce7239683ab..60e1cf1d88002cb06a9445255a5f923ea5486ed6 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 ce1efa5cdd54125be187fc134bbabe116ca2db6c..cf5a021ff9a439888dcc0f44acf2d2d6701111a5 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 e1c282ea1f37d26860872ed7315414c565111df6..304c62eb2f72081726a84c37642f5fed5e926677 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 ff01be40f6eb96fc66c7b523cab610bd6841e72c..d790c1d6a7ff70c37dd0a409406b1eac8ce1719b 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 9628cbe255c7f19b998b9b7dece81ec86f0aa893..de7d7ee793c22da667ddf74d8d9beeb466f4ee5a 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 c78ed2c56f15f482f148e79533aec5f73a91b5a5..885fc8f9ebac1e2cbd2e3478d30b36591b2e8f61 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 7bfb2fb4f3c3d8f1399bc00cbf37ea636e87eef7..753567548f57d86b808a352bba33586c631109b7 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 be89460b997eea1e7d9e9a6b2f9d8689b414bdec..686e288ebd54207ccd593239b1d3e253b2861fba 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 6e4f8654c6625645050bd265a998d567fb7a9dc2..984de02d6f63d0a7c496ed3a7849ddf490ed2cbc 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 09efe4dd7b425f8563de714eff4e76774c8789c8..d4bb0910fcb15f127daebb72431b688f76ff5476 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 339ca5363dbf81bd169d5b67eef2dc9c64048414..45d7b72201b77157a25d604f4c48745e77330d5c 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 2e8ea4ea7a4a0397831ef37512fb0de5a4dd5ca1..2919527777d42a55e8adced81ca4028cf213b3f3 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 f8600d0685c3c55f346107ad9533baa962a570b0..449386e34a0ebf9e23d250bac77dd04cc8eb71ac 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 e6ffed3f0a254456797b65779e1bd2a22581c8a9..4fa91c93b45679816a836fd1c5c600b8d916ecea 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 992ff0dac12a95d0bbc87b8e4e21fff8d2fada2a..077982a414e92194261db7c68369ffdc77b3bd5e 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 4367dce01cb54ad587be06f5f225c5de06dbf530..1873c84acc978c0a5abb1d5265fc9970a4e2f2a0 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 5a0f58530ed7cabed5249a63a718fc3c9ceea5d3..39e3fc641273dd3ed1d2310659e953b380a20c68 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 2f99f5e6c2c99d8777be48b8da9c50fe96e17fa3..a716c4b61c0cef1b8aa81d11e8c3ca7548490651 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 982693726b2eb490512859cc7790234b518e3e60..53493a00978ed4fed890f4bc28589d26e70dae4d 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 6d281e08b0a570b2cac0f769644a149f2ae8354c..cd33f2bd45bed054875438d63c1fcfe2e398cac3 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 9a89ffbf6e2562b4ab63fad7ef22e66e1a2541a6..d80ede9b41978e5b032abc3447a920201c9c2f81 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 5ec1f1cce5dff4bb100557c883e7304d5eddab43..8f29b78ee0ed66701fcaa80a77fbfd250cbb9497 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 4f7f624e3a5390b3ac4721d3908c0cdcf9d7eb4a..0d659a169a9ccb2178bb08432ff3748f85c61776 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 42d587283420e7f8a7b395c8bba86a4ac5f064dd..eb270efdcd2ccaeaad12039531ae07e4a7358408 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 d712b1cdbd5a6df0c661f71f1a83ac4bba29794a..a437b3e67a5713f708262bd9ad18aeba4aac287e 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 4bcbda260e9d6c0159864c71e20cd33b0a80fe68..ad3f95f7078c186fd13d6ff8bd5100fba7dec1f3 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 cf554a745dd29e914397d4e746027db6aa98073f..1fcce46e6695c1c61395bf8fa6c240d7da6c908e 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 80d7436fa1f29c86d7ca29137bbf8ca5e1e0a002..372597ded103f6fbfffa6e0434d90635b5b97adf 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 41490df56c3e784f21d700e94ad75735f875e110..121640a0e1fe24d6cc0091d6bfc845932a7df12a 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 9455daae8dabe9eae892fb47ef9fa81e8c620194..7d6ebcd6f7867d679b30c4d1a651ba9a62ff2e3d 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 a85f259c311ffa101f1ef6920730091b80368a7b..94b6c0c301b28737d68bcf74b2687af6b4f981e6 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 f08ccb44dff9160789817f4b72588f3bf52d0ea1..86100cde7d2cbede9f7f71b9de1b6a25f82f802c 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 cc91f5e75ee27979d0de2ce14516dc41a36e0adf..0eafe4d1ba3d1fb6feb694c316b6ae86fe339505 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 f42230262a1dff45209c73568e1c156f2d89e832..3d32bab42b10a07b034740aca0799820262a0f01 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 e29dddc4f0e28b9d6ebf43786e05f4f64e459823..75eba7add17b27abd4de4f32834b58b8f9edcc36 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 98ad24fd118ead3f5828e8845921358c13804eba..817d5d8fad7c323da78c80e4616fb50cd60afb63 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 be2bcd2e99f600e49c555b0b24ea17377fef351e..298877257f96a7a4d77ab9b6e28a9818fb4c88ff 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 9aa387638300d0ee2ec03af070efc06b1d03fabd..1f79be49b65b7401da5bcf1ff8546ea79cc9be48 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 566d3137703cdd0160eb5bbb87fdaebfe8a3bd1d..e7fce458fae797ed7ca4da3321a7c3b40a9791fc 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 fb34c3f8acaca3f889d290b1bd94a820afd168c2..d5110bdef9559e6bb9bb95e18371ddc966053171 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 55bab18a985d7d4ce29fbe5a6d77ac5ba2a4bad6..c6c3bc98c74b9fc70bd547cf1e788c983b27a5db 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 43e5c6daca91ae2fe1ad09f05fb12cd3230213b1..5977e3c0243f69c3c83895a3593ba9158d37033d 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 32c3567332a74d43dc22131252a0dcc3ab08a0a7..bb94704fa6b58e8a23c291551bc3a3657c2c87f2 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 bf551d52b1f0653591884dbc8f52912f22a93791..2afbc30b3b35a34fac30cd5decfaf36683c4ad31 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 b7a074471fc9695fc0ebfa2e5c3e797ce9258969..a3100d7a188534c1acfdff2d8e35942796ba984f 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 695ca7683bda727aadb34672f44e1d4aaa9de963..c0872435a2ee20c7acdf8c96699274103a960c33 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 e1c476cf19b8f48a88b88c693b959ab5d2e2cbae..76a90d8713f21e58ea0202acb103571855a2aedd 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 2e2924d0fd45d2fb322b4b126a9a0fdade2006c8..e29b7cb23a90f423754b166bd25e05dbe024e5b2 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 5fe8938aa4c9c5e4de1fad9904d0710b5048bb82..67422393e9c4197030d5c60fdf0c0ec34b9cbb40 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 661b5e912bcbf820ffae1796429306f1ac85097e..1993cc2dc28d5af292fcc5a766a2b3a182a7e6e3 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 b578d2edc33d3a6a93465e3b243cf31511cafaab..1124dc777ee7437b5ffa39fb12f24cc0f2c73c35 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 d9de6ea1a7b747ec8eeb8f7946a764dc4f443d6a..5be89f74db29a6a509811f786b53f6c32ba9ccf1 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 8772439529ac9f80a271f667a97659dfbbc200b5..a8057671b5d884c356a97b44582e639aa77a919a 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 958eb6e07bd4ef811795b29a4f7a0220a54b4a55..563fd01cae98f4b00d049cd9dd12d6e8b12e9477 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 1d9ff4dd7d11848558b6a7ca046b1c400bcbb1c2..fa82730f4e7ba9ebd7fe02c66a9c9d273b314d18 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 7ed7d7d6fcde05e762bf7e9f510867f98334ba3f..64660510bc0b8171111c98c7ad5051deb201d36d 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 75a79bf07297cc2c90b03b201bf2663e30fe15fb..1f99b1750f0a2791ee5796c782c3b6f5b4947c0c 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 67a63d9333a8b1a175d425f960b8b1319edde178..e0d95d0ae63ab27653effc0b43fdff2a2ee7440e 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 00b882e74830ef78397d68ad93c6ea403881bdd2..b5195b5d0505f19d2ee5436e257c43e60be228f7 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 e23ebe1d1bc2e0cf7a2a64ca50e0dab2f3441a17..ddfbff98abae696dd4d4780153ff8e088f695b24 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 1fafa8b62c6b7571661bd827ad71a4ebdc797168..fa9d8110162d5deb7379e06f4eba80856725e1d0 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 f7feb778706ebae76db25beb5586577ef64b7ce1..8e175d9bda89dd3a9ede3caf20dbff4678522f03 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 a388bfa34def908286217c739ff1f847b5a826b6..dff20df29cabe55a3281ab758283b033c166bea6 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 243cf5d4802b5de1d2f4f634bacd7881d615df53..0369a8ad3ca5784d4955160a1baf31900cc0ba47 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 84ce9bd767e3b1aebbaf04ae911157a85a3f1407..a664fa7c858199bd1d082aef492b4beae930e07b 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 3316161fc663038b1309e120210b97ec51ae38f8..1d240f774c9de9c36c669b1618432ae2e6a436b4 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 fd0e30210763b3fd8717b52ca8c10a1afb0def26..ea63e2b4d4962baf9a26ff2661b65ed141d13c95 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 61625ec1280592b6d291e66b5767c842555a2197..8522f368ce00f316c997eea329ec353ea7f2a767 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 143f29aec7eb678e035fda633b5813c832a19261..69eb3bdd78d2ee83cd5f993f04e17321536bc895 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 da8ba78f7706d53ff9b1871530905daedf208577..10777c9272c07f58342bc6444793af8e698bc890 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 011ca0f12fd98332e56c240013c0a3484345db80..3f403e38921c6e301969bc8b17f385555d86d24b 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 9977af36f6716a3c0447048ea461009629a84719..d001131ebc5a865b14546888dda62fab9879c639 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 b334d2ec6b411b0fe211415e33b9c3d570eb46c5..2b8bc97921304edf88b6ff969666e29866f30190 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 e9236ac617019f0f486c0ea26a2d4a64dd97a701..7a1c3e2f97467c0a4f4c1ef0e77e1d446760dba4 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 5d9781e992c6d1b1ff8bc6e86b3b175ce6a2dca1..2912158fd3b6cf7481f917d1663f9cae74248ce2 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 acd7791de0b5f3166f7108f0281c6a5650cec182..78e631faa4c34deeca9af00592770e33b5f8d913 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 b432c7c9b55e7a018dea65348066e323828a9013..babdf610012d2db98e2115f40d0751b316921f84 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 e3c1514ebdce60adf7917498f3e480789ec5c145..04af6d335a0a8167a5ca61e891accbc6bb0d1a94 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 11eead01dbb899d2512d93018c7c7b2af544fdb7..986a2c348633d570728d31b16970d7853dd0cc72 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 23454b978cac9a7b573f5fae6122b35f30d92608..a89ea2331048b1d1cb630d2384ca4e249d64539a 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 fe0f7d07c94983de8e639e7086228cef6197ba8b..bfaf4a26947341907391a313cc4f1abca96cc13f 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 39ee1a6f05521ac1fd0bbd45b4a9fe31dc3fcb18..bf2349dce816bcfe6376bd048e02b34706780132 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 22f98f2d279dd4788566da84656ae947551cc9d4..b1893449d0f068f3568356f6f55eedc095c6ce58 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 e864da49e17f8ebd0a3c805061ebac52cf66d981..fca9783b0f8806e96ea0a929f2bcf4dfe262a06d 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 e5d668d2ff2cf35eccdf4c69067384e552a03b38..20fd6e89681f07c5fcafb094e300d5795f38832c 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 bb56fae944353a5900f66ddd6c13ceb2abfd84c7..cc35448e5030ae9ba68d4566348644f72f04f08d 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 9d7229c57a16cf8d0455702a621faec172cd73ea..69b47570057e09a39c8884db61f9c19f90aeb609 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 e8a87b5656982b4c93590fdfa428f2e346f75350..a2289d7444dd83b288a8e7e01f49234b568852ec 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 556e9ccb91b934d0a302a16b53ba52baea5e4863..85658b51d8fd9bcf2992da9688ed7d1486687d15 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 aa404416d8df995e6306b6b9f1d8282d54d8279b..3592575c491b0f36d4375f9a7a146e09adbd5851 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 4c1e1b60238fe0bf88ea2577c703df6edce64709..53d00ac312b0ab8c9512227322a47b7144374d08 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 0303ba67fd6a03143ee6e77198731a2f8b6ec0aa..7716170e77444e8f16814da460a9a14d78b39b5b 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 53cbc3e066ac02471216fdab9cc2b844d08ab91a..4ff0b196ff037ea29fcf445f9be27a4ce636e53a 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 d4bc5de3468b543461a8a7ce3d1f5296e4ea71c1..5fe316d94b18dc6df5212e35a2002942871487ee 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 53fafbdaa829e02ee3242fb80e5bc1dda3e474e0..fdfcb10d95ae8111f4c573747cd7c5c36dccdb29 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 3d62ea405f2c1c9e83b30eb6246683541180f07d..bf6f3fedafb9cf2bc6c17a0fedfc81870e3fcc41 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 be5691f25eeba8ac726df4970b47fcea7b7d8447..322948ae490462b8d7a895481e6c14fa88bde333 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 757a00eebb8374640d4fd3ea5d3cae1757d2388f..d17a75cd800904b1061f1da020fa77d7a1f9ac89 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 9b246cbe1e8e331cf9c38cea69fc470c1ae578c9..1de709d9fd883be9ca7a3e4ec5d7ba44dd60adb7 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 59242900a551c4fa4fa38b0d0c083b10093257a0..91bfbbeac783afd6c560ee9b91891ebd06bb9e15 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 db6ce7d58e87bc18a184dd7876d293437e1a3520..aa8c537b3d3a4bc85776e5954db0b68dfa6ffd7c 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 8b56a07b30e3c81271897d5e9b78d2b5d7753986..5ed0cdadc38f8e9e8199a35d588df6d796e6d6ff 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 c297c4916012ef4a8583444bfea62b0c44a26ca5..25ad21646b01ee6deb97840a9381cfdd578ea2bb 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 46e8d64ab085a2a89659272c4589b3a9f63cab32..4c58ea2e4e7e810999853d3441c43fab71d32686 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 44c8adb94002c1e4a60add8ab28b69b19d437d10..06fa8144c423b1e3a688f0c917f909a9f3844766 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 f2a844ff4921b78a8cbe92028fd6d9e78513f15b..939de884a03ae89bc094fdd013d7abdf25e7d8d8 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 fa9c00515e9f583c45c0cb6b6ac96e1be2028032..a0fa855af2075916822bbfddd3ad1758bfb70c83 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 cdc0cdc57088211a40492de4495edc4276978cec..dc6e0788f3b10df57e25ef5821d6f8173fcd9df5 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 """