diff --git a/docs/source/guides/module.rst b/docs/source/guides/module.rst index 533f3cc9333c3351ee67357c1791014b58da5c6e..6128a146bc39923a0490de32ddddd3b3f05201d1 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:`BaseBackend ` class. -* **backend.py** - defines the main class of your module, which derives :class:`BaseBackend `. +* **__init__.py** - needed in every python modules, it exports your :class:`BaseModule ` class. +* **backend.py** - defines the main class of your module, which derives :class:`BaseModule `. * **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 ``backend.py``. It contains the main class of the module derived from :class:`BaseModule ` class:: - class ExampleBackend(BaseBackend, CapBank): + class ExampleBackend(BaseModule, 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 ExampleBackend(BaseBackend, CapBank): + class ExampleBackend(BaseModule, 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 ExampleBackend(BaseBackend, CapBank): + class ExampleBackend(BaseModule, CapBank): # ... def iter_accounts(self): @@ -271,7 +271,7 @@ Now you have a functional browser, you can use it in your class ``ExampleBackend from .browser import ExampleBrowser # ... - class ExampleBackend(BaseBackend, CapBank): + class ExampleBackend(BaseModule, 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 ExampleBackend(BaseBackend, CapBank): + class ExampleBackend(BaseModule, 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:`BaseBackend ` provides a method named -:func:`fillobj `, which can be called by an application to +The class :class:`BaseModule ` 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 ``ExampleBackend``:: - class ExampleBackend(BaseBackend, CapVideo): + class ExampleBackend(BaseModule, 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 ExampleBackend(BaseBackend, CapVideo): + class ExampleBackend(BaseModule, 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:`BaseBackend ` +To store and read data in your storage space, use the ``storage`` attribute of your :class:`BaseModule ` object. It implements the methods of :class:`BackendStorage `. diff --git a/modules/750g/backend.py b/modules/750g/backend.py index 720f605c36577a90c7daa7bcc1a5bcb691f5033a..5488b3e3ef4f522663d93c8245188b4c0ee7f815 100644 --- a/modules/750g/backend.py +++ b/modules/750g/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import SevenFiftyGramsBrowser @@ -30,7 +30,7 @@ def strip_accents(s): __all__ = ['SevenFiftyGramsBackend'] -class SevenFiftyGramsBackend(BaseBackend, CapRecipe): +class SevenFiftyGramsBackend(BaseModule, CapRecipe): NAME = '750g' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/adecco/backend.py b/modules/adecco/backend.py index 070b3fceecbe73c21ca42c30d90467dd6e1523a8..893441c716d957da554da1a1a4b60cbebe477b97 100644 --- a/modules/adecco/backend.py +++ b/modules/adecco/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value from weboob.capabilities.job import CapJob @@ -28,7 +28,7 @@ __all__ = ['AdeccoBackend'] -class AdeccoBackend(BaseBackend, CapJob): +class AdeccoBackend(BaseModule, CapJob): NAME = 'adecco' DESCRIPTION = u'adecco website' MAINTAINER = u'Bezleputh' diff --git a/modules/agendadulibre/backend.py b/modules/agendadulibre/backend.py index 040e543d9f903d72450fd10402c51a12a95c3220..b5b65152a4d512179d7b909974189d3c6e9205a4 100644 --- a/modules/agendadulibre/backend.py +++ b/modules/agendadulibre/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['AgendadulibreBackend'] -class AgendadulibreBackend(BaseBackend, CapCalendarEvent): +class AgendadulibreBackend(BaseModule, CapCalendarEvent): NAME = 'agendadulibre' DESCRIPTION = u'agendadulibre website' MAINTAINER = u'Bezleputh' diff --git a/modules/allocine/backend.py b/modules/allocine/backend.py index c1a1ef2c4f765c86fc2209875637c47e4546dfde..911c21e09ee09507e2b91d7b89cb12e17eb54c5c 100644 --- a/modules/allocine/backend.py +++ b/modules/allocine/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.cinema import CapCinema, Person, Movie -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import AllocineBrowser @@ -27,7 +27,7 @@ __all__ = ['AllocineBackend'] -class AllocineBackend(BaseBackend, CapCinema): +class AllocineBackend(BaseModule, CapCinema): NAME = 'allocine' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/alloresto/backend.py b/modules/alloresto/backend.py index e71a85ed312432461b45195429fdd976439b0283..4a3de6cc4d6c112ffabc058457260a6f002bfe1b 100644 --- a/modules/alloresto/backend.py +++ b/modules/alloresto/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AlloRestoBrowser @@ -29,7 +29,7 @@ __all__ = ['AlloRestoBackend'] -class AlloRestoBackend(BaseBackend, CapBank): +class AlloRestoBackend(BaseModule, CapBank): NAME = 'alloresto' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/allrecipes/backend.py b/modules/allrecipes/backend.py index b1a8d5447d581694f121b6bbd702f6b80eaacde6..a979fe360f5ac784ff6b4707341d51996e6363d7 100644 --- a/modules/allrecipes/backend.py +++ b/modules/allrecipes/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import AllrecipesBrowser @@ -27,7 +27,7 @@ __all__ = ['AllrecipesBackend'] -class AllrecipesBackend(BaseBackend, CapRecipe): +class AllrecipesBackend(BaseModule, CapRecipe): NAME = 'allrecipes' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/ameli/backend.py b/modules/ameli/backend.py index 4e4a4e598d347ec878e8a65ab42dc65fd931e64c..d02f529dbb03a353c917118575d7037d8f05d76d 100644 --- a/modules/ameli/backend.py +++ b/modules/ameli/backend.py @@ -19,14 +19,14 @@ import urllib from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AmeliBrowser __all__ = ['AmeliBackend'] -class AmeliBackend(BaseBackend, CapBill): +class AmeliBackend(BaseModule, CapBill): NAME = 'ameli' DESCRIPTION = u'Ameli website: French Health Insurance' MAINTAINER = u'Christophe Lampin' diff --git a/modules/amelipro/backend.py b/modules/amelipro/backend.py index a377d83c8f4d0e1a113c00ea055661a9ad64bf34..e607c82e0fd84184e5ec6fcae3ac1cec65ba35eb 100644 --- a/modules/amelipro/backend.py +++ b/modules/amelipro/backend.py @@ -19,14 +19,14 @@ import urllib from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AmeliProBrowser __all__ = ['AmeliProBackend'] -class AmeliProBackend(BaseBackend, CapBill): +class AmeliProBackend(BaseModule, CapBill): NAME = 'amelipro' DESCRIPTION = u'Ameli website: French Health Insurance for Professionals' MAINTAINER = u'Christophe Lampin' diff --git a/modules/americanexpress/backend.py b/modules/americanexpress/backend.py index 219d447660d02e25e8e5341da297d4ad1ed617cd..f85bc696e3d676191437ce483aaa0656dea694b8 100644 --- a/modules/americanexpress/backend.py +++ b/modules/americanexpress/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AmericanExpressBrowser @@ -29,7 +29,7 @@ __all__ = ['AmericanExpressBackend'] -class AmericanExpressBackend(BaseBackend, CapBank): +class AmericanExpressBackend(BaseModule, CapBank): NAME = 'americanexpress' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/apec/backend.py b/modules/apec/backend.py index e1e7ded393d3a258e40758e876c4fa8b392e4d05..b3610afa84ccc9c01fc0e3a64d4c86ea97c9d8c8 100644 --- a/modules/apec/backend.py +++ b/modules/apec/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.capabilities.job import CapJob from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value @@ -28,7 +28,7 @@ __all__ = ['ApecBackend'] -class ApecBackend(BaseBackend, CapJob): +class ApecBackend(BaseModule, CapJob): NAME = 'apec' DESCRIPTION = u'apec website' MAINTAINER = u'Bezleputh' diff --git a/modules/apivie/backend.py b/modules/apivie/backend.py index 02db982f4bfd677e527a38a61ee222f62b9f27dc..ef298771d1069a61fd701fd5843301422d5b17be 100644 --- a/modules/apivie/backend.py +++ b/modules/apivie/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.bank import CapBank -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import ApivieBrowser @@ -27,7 +27,7 @@ __all__ = ['ApivieBackend'] -class ApivieBackend(BaseBackend, CapBank): +class ApivieBackend(BaseModule, CapBank): NAME = 'apivie' DESCRIPTION = u'Apivie' MAINTAINER = u'Romain Bignon' diff --git a/modules/arretsurimages/backend.py b/modules/arretsurimages/backend.py index 8985ae82cbe3c3f2255b51c5c6b9d72cd1e833eb..7bc49373f2170c1bfc708bbc0675b5d0c783c3b3 100644 --- a/modules/arretsurimages/backend.py +++ b/modules/arretsurimages/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import ArretSurImagesBrowser @@ -29,7 +29,7 @@ __all__ = ['ArretSurImagesBackend'] -class ArretSurImagesBackend(BaseBackend, CapVideo, CapCollection): +class ArretSurImagesBackend(BaseModule, CapVideo, CapCollection): NAME = 'arretsurimages' DESCRIPTION = u'arretsurimages website' MAINTAINER = u'franek' diff --git a/modules/arte/backend.py b/modules/arte/backend.py index d5783c5b047529043ae5253f03956859aa221812..3ac365a15b36ba9fe667ce81e761e662f502cec7 100644 --- a/modules/arte/backend.py +++ b/modules/arte/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import Value from .browser import ArteBrowser @@ -32,7 +32,7 @@ __all__ = ['ArteBackend'] -class ArteBackend(BaseBackend, CapVideo, CapCollection): +class ArteBackend(BaseModule, CapVideo, CapCollection): NAME = 'arte' MAINTAINER = u'Bezleputh' EMAIL = 'carton_ben@yahoo.fr' diff --git a/modules/attilasub/backend.py b/modules/attilasub/backend.py index b15efc8b4d9d7c6c904aa2fbf74e831924974ff2..a6276ec6b24a5225470b2de9db12d8a7f2506f7f 100644 --- a/modules/attilasub/backend.py +++ b/modules/attilasub/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import AttilasubBrowser @@ -27,7 +27,7 @@ __all__ = ['AttilasubBackend'] -class AttilasubBackend(BaseBackend, CapSubtitle): +class AttilasubBackend(BaseModule, CapSubtitle): NAME = 'attilasub' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/audioaddict/backend.py b/modules/audioaddict/backend.py index bf534358031354585665085948518553d83c8f0d..29e46deade74815ddc75bfa6ee234db961dd93e4 100644 --- a/modules/audioaddict/backend.py +++ b/modules/audioaddict/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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 AudioAddictBackend(BaseBackend, CapRadio, CapCollection): +class AudioAddictBackend(BaseModule, CapRadio, CapCollection): NAME = 'audioaddict' MAINTAINER = u'Pierre Mazière' EMAIL = 'pierre.maziere@gmx.com' diff --git a/modules/aum/backend.py b/modules/aum/backend.py index 82d530f82eade3b52ece928e3cded5d1298f76ad..7a59740af819a54838d9f85f8b57df32bdbf5c4b 100644 --- a/modules/aum/backend.py +++ b/modules/aum/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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 AuMBackend(BaseBackend, CapMessages, CapMessagesPost, CapDating, CapChat, CapContact, CapAccount): +class AuMBackend(BaseModule, CapMessages, CapMessagesPost, CapDating, CapChat, CapContact, CapAccount): NAME = 'aum' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' @@ -79,7 +79,7 @@ class AuMBackend(BaseBackend, CapMessages, CapMessagesPost, CapDating, CapChat, MAGIC_ID_BASKET = 1 def __init__(self, *args, **kwargs): - BaseBackend.__init__(self, *args, **kwargs) + BaseModule.__init__(self, *args, **kwargs) if self.config['antispam'].get(): self.antispam = AntiSpam() else: diff --git a/modules/axabanque/backend.py b/modules/axabanque/backend.py index 6421ec04449cf6ac83b77be7fc82c65f23a2d978..8ef99a07a8b52f9492e7e0bead32dbd284ae7c7d 100644 --- a/modules/axabanque/backend.py +++ b/modules/axabanque/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import AXABanque @@ -28,7 +28,7 @@ __all__ = ['AXABanqueBackend'] -class AXABanqueBackend(BaseBackend, CapBank): +class AXABanqueBackend(BaseModule, CapBank): NAME = 'axabanque' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/banqueaccord/backend.py b/modules/banqueaccord/backend.py index 4daa63adeab316bcaddba7657c13e2f920487e78..a64823f5b4666bd0bcbd77f500deaf406af82e90 100644 --- a/modules/banqueaccord/backend.py +++ b/modules/banqueaccord/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.base import find_object from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import BanqueAccordBrowser @@ -29,7 +29,7 @@ __all__ = ['BanqueAccordBackend'] -class BanqueAccordBackend(BaseBackend, CapBank): +class BanqueAccordBackend(BaseModule, CapBank): NAME = 'banqueaccord' DESCRIPTION = u'Banque Accord' MAINTAINER = u'Romain Bignon' diff --git a/modules/banquepopulaire/backend.py b/modules/banquepopulaire/backend.py index 60c82a9bcf4597979bf1b3852663b12fffc5a45a..6243e36bd54c2364404ed3e691b7544c61963e6c 100644 --- a/modules/banquepopulaire/backend.py +++ b/modules/banquepopulaire/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import ValueBackendPassword, Value @@ -29,7 +29,7 @@ __all__ = ['BanquePopulaireBackend'] -class BanquePopulaireBackend(BaseBackend, CapBank): +class BanquePopulaireBackend(BaseModule, CapBank): NAME = 'banquepopulaire' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/barclays/backend.py b/modules/barclays/backend.py index 21164f518d4b3c3fd07c3b4fe7ddf68891e3816a..fa57dc8be9075f072461e46c24e3c66ac14c4635 100644 --- a/modules/barclays/backend.py +++ b/modules/barclays/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Barclays @@ -28,7 +28,7 @@ __all__ = ['BarclaysBackend'] -class BarclaysBackend(BaseBackend, CapBank): +class BarclaysBackend(BaseModule, CapBank): NAME = 'barclays' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/biplan/backend.py b/modules/biplan/backend.py index 0bfd454f20cce4c1aaa990ddb65684000c4e9087..535dcaaff56975dda9e6c38c4e34bd485bd7691d 100644 --- a/modules/biplan/backend.py +++ b/modules/biplan/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES import itertools @@ -28,7 +28,7 @@ __all__ = ['BiplanBackend'] -class BiplanBackend(BaseBackend, CapCalendarEvent): +class BiplanBackend(BaseModule, CapCalendarEvent): NAME = 'biplan' DESCRIPTION = u'lebiplan.org website' MAINTAINER = u'Bezleputh' diff --git a/modules/bnporc/backend.py b/modules/bnporc/backend.py index 2bd60111075fe38c8822c1fa1bf76e27a4608bf9..c4cbd9cc5eb905d0ad38fd6ab6c6540fbdfbfc8d 100644 --- a/modules/bnporc/backend.py +++ b/modules/bnporc/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import BNPorc @@ -33,7 +33,7 @@ __all__ = ['BNPorcBackend'] -class BNPorcBackend(BaseBackend, CapBank, CapMessages): +class BNPorcBackend(BaseModule, CapBank, CapMessages): NAME = 'bnporc' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' @@ -54,7 +54,7 @@ class BNPorcBackend(BaseBackend, CapBank, CapMessages): CACHE_THREADS = timedelta(seconds=3 * 60 * 60) def __init__(self, *args, **kwargs): - BaseBackend.__init__(self, *args, **kwargs) + BaseModule.__init__(self, *args, **kwargs) self._threads = None self._threads_age = datetime.utcnow() diff --git a/modules/boursorama/backend.py b/modules/boursorama/backend.py index 6c906d01e3c4c47687e78555ef5350bea0c348d9..fc2f95c8f8d5eddf1497c7cf1ba16a0ad5f14c38 100644 --- a/modules/boursorama/backend.py +++ b/modules/boursorama/backend.py @@ -21,7 +21,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, ValueBool, Value from .browser import Boursorama @@ -30,7 +30,7 @@ __all__ = ['BoursoramaBackend'] -class BoursoramaBackend(BaseBackend, CapBank): +class BoursoramaBackend(BaseModule, CapBank): NAME = 'boursorama' MAINTAINER = u'Gabriel Kerneis' EMAIL = 'gabriel@kerneis.info' diff --git a/modules/bouygues/backend.py b/modules/bouygues/backend.py index 9a25c925499605c17fb5c9e4ea8005536acd678b..6d7a2e233dd2821325d9d699bc5fef47c161f63a 100644 --- a/modules/bouygues/backend.py +++ b/modules/bouygues/backend.py @@ -21,7 +21,7 @@ from weboob.capabilities.messages import CantSendMessage, CapMessages, CapMessagesPost -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import BouyguesBrowser @@ -30,7 +30,7 @@ __all__ = ['BouyguesBackend'] -class BouyguesBackend(BaseBackend, CapMessages, CapMessagesPost): +class BouyguesBackend(BaseModule, CapMessages, CapMessagesPost): NAME = 'bouygues' MAINTAINER = u'Christophe Benz' EMAIL = 'christophe.benz@gmail.com' diff --git a/modules/bp/backend.py b/modules/bp/backend.py index 02090a5627219771adbcc3ccc25093733493a831..180cb34ddf502d4dbfbf6adbfe98e7ffce8b4501 100644 --- a/modules/bp/backend.py +++ b/modules/bp/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, Account -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import BPBrowser @@ -28,7 +28,7 @@ __all__ = ['BPBackend'] -class BPBackend(BaseBackend, CapBank): +class BPBackend(BaseModule, CapBank): NAME = 'bp' MAINTAINER = u'Nicolas Duhamel' EMAIL = 'nicolas@jombi.fr' diff --git a/modules/bred/backend.py b/modules/bred/backend.py index 86e0d20ab1abacf5ceaf6e17c1cb43b3c890a95b..6bd5247921c75a6a491f4e9ab96969acc2f502fd 100644 --- a/modules/bred/backend.py +++ b/modules/bred/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import BredBrowser @@ -29,7 +29,7 @@ __all__ = ['BredBackend'] -class BredBackend(BaseBackend, CapBank): +class BredBackend(BaseModule, CapBank): NAME = 'bred' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/btdigg/backend.py b/modules/btdigg/backend.py index 2e19d6ebd374ea88d681600211024c8ea0f76397..1c0b2e9bdc0a1b6cc3d3af2c5934a4274173308d 100644 --- a/modules/btdigg/backend.py +++ b/modules/btdigg/backend.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- from weboob.capabilities.torrent import CapTorrent -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import BTDiggBrowser __all__ = ['BTDiggBackend'] -class BTDiggBackend(BaseBackend, CapTorrent): +class BTDiggBackend(BaseModule, CapTorrent): NAME = 'btdigg' MAINTAINER = u'Matthieu Rakotojaona' EMAIL = 'matthieu.rakotojaona@gmail.com' diff --git a/modules/btmon/backend.py b/modules/btmon/backend.py index a26c5fcb3ca0999227aad93796ceaf8b002076ba..b12a1b15f60a45a23a96daa8ea940d53fdb2b666 100644 --- a/modules/btmon/backend.py +++ b/modules/btmon/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.torrent import CapTorrent, Torrent -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import BtmonBrowser @@ -27,7 +27,7 @@ __all__ = ['BtmonBackend'] -class BtmonBackend(BaseBackend, CapTorrent): +class BtmonBackend(BaseModule, CapTorrent): NAME = 'btmon' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/caissedepargne/backend.py b/modules/caissedepargne/backend.py index 651b11bad5451e495144d74b0e91f0b17f11b138..630d739120fdcf68f489b3f358a8c274b7d200bc 100644 --- a/modules/caissedepargne/backend.py +++ b/modules/caissedepargne/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import Value, ValueBackendPassword from .browser import CaisseEpargne @@ -28,7 +28,7 @@ __all__ = ['CaisseEpargneBackend'] -class CaisseEpargneBackend(BaseBackend, CapBank): +class CaisseEpargneBackend(BaseModule, CapBank): NAME = 'caissedepargne' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/canalplus/backend.py b/modules/canalplus/backend.py index fb29ed8747050fa73c880b78de0e24964bd706e7..cfb3f256393343bc489132457d4f9520d4262591 100644 --- a/modules/canalplus/backend.py +++ b/modules/canalplus/backend.py @@ -20,7 +20,7 @@ import re from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import Value from .browser import CanalplusBrowser @@ -32,7 +32,7 @@ __all__ = ['CanalplusBackend'] -class CanalplusBackend(BaseBackend, CapVideo, CapCollection): +class CanalplusBackend(BaseModule, CapVideo, CapCollection): NAME = 'canalplus' MAINTAINER = u'Nicolas Duhamel' EMAIL = 'nicolas@jombi.fr' diff --git a/modules/canaltp/backend.py b/modules/canaltp/backend.py index 1d759e61fb56f12b59a4b2a7ab8dedfbeb191459..031a5219f4f460fd3c876c803189f8d5a49bc811 100644 --- a/modules/canaltp/backend.py +++ b/modules/canaltp/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.travel import CapTravel, Station, Departure -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import CanalTP @@ -26,7 +26,7 @@ __all__ = ['CanalTPBackend'] -class CanalTPBackend(BaseBackend, CapTravel): +class CanalTPBackend(BaseModule, CapTravel): NAME = 'canaltp' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/cappedtv/backend.py b/modules/cappedtv/backend.py index c698ced3308f580255b770d2598fd0600debc8b2..2cb28062df7cfdf355c9bf6a4e0c540b74074941 100644 --- a/modules/cappedtv/backend.py +++ b/modules/cappedtv/backend.py @@ -12,14 +12,14 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import CappedBrowser, CappedVideo __all__ = ['CappedBackend'] -class CappedBackend(BaseBackend, CapVideo, CapCollection): +class CappedBackend(BaseModule, CapVideo, CapCollection): NAME = 'cappedtv' MAINTAINER = u'Lord' EMAIL = 'lord@lordtoniok.com' diff --git a/modules/carrefourbanque/backend.py b/modules/carrefourbanque/backend.py index 67ad8110df0ceb59f6ed32bcf8151866613013c0..88bbc6f1766356e54965e5ec6072d3fdfb4f5fc5 100644 --- a/modules/carrefourbanque/backend.py +++ b/modules/carrefourbanque/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.base import find_object from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import CarrefourBanque @@ -29,7 +29,7 @@ __all__ = ['CarrefourBanqueBackend'] -class CarrefourBanqueBackend(BaseBackend, CapBank): +class CarrefourBanqueBackend(BaseModule, CapBank): NAME = 'carrefourbanque' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/cci/backend.py b/modules/cci/backend.py index 87a2861dbb859e5244fbaffc5f5be31ac0df8413..270d1388083bbf242cd6e2c65555cf00e3d5a35c 100644 --- a/modules/cci/backend.py +++ b/modules/cci/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.capabilities.job import CapJob, BaseJobAdvert from weboob.tools.value import Value @@ -28,7 +28,7 @@ __all__ = ['CciBackend'] -class CciBackend(BaseBackend, CapJob): +class CciBackend(BaseModule, CapJob): NAME = 'cci' DESCRIPTION = u'cci website' MAINTAINER = u'Bezleputh' diff --git a/modules/champslibres/backend.py b/modules/champslibres/backend.py index 960b80d8ce165629fc801e9f0dbdd38fa74604ae..ed02258f7d2459142c021ac395b4d4c52148ec49 100644 --- a/modules/champslibres/backend.py +++ b/modules/champslibres/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.library import CapBook -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import ChampslibresBrowser @@ -28,7 +28,7 @@ __all__ = ['ChampslibresBackend'] -class ChampslibresBackend(BaseBackend, CapBook): +class ChampslibresBackend(BaseModule, CapBook): NAME = 'champslibres' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/chronopost/backend.py b/modules/chronopost/backend.py index 999b3455994b9cac83cf52b53b2e126b274f0081..1015bb86470b112006cf80149a9c8a9ab960eff0 100644 --- a/modules/chronopost/backend.py +++ b/modules/chronopost/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.parcel import CapParcel -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import ChronopostBrowser @@ -27,7 +27,7 @@ __all__ = ['ChronopostBackend'] -class ChronopostBackend(BaseBackend, CapParcel): +class ChronopostBackend(BaseModule, CapParcel): NAME = 'chronopost' DESCRIPTION = u'Chronopost website' MAINTAINER = u'Romain Bignon' diff --git a/modules/cic/backend.py b/modules/cic/backend.py index b758b422a8c7ab7d2d1a8ce36fdb2c0e764788e9..5833d93aacc06707bc7d7548fe3afdc238d58516 100644 --- a/modules/cic/backend.py +++ b/modules/cic/backend.py @@ -23,7 +23,7 @@ import string from weboob.capabilities.bank import CapBank, AccountNotFound, Recipient, Account -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import CICBrowser @@ -32,7 +32,7 @@ __all__ = ['CICBackend'] -class CICBackend(BaseBackend, CapBank): +class CICBackend(BaseModule, CapBank): NAME = 'cic' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/citelis/backend.py b/modules/citelis/backend.py index d7c303627545fa8fab432990d7247c19f3991c61..52999544382b1a4e4fc7ffa4afabdc9ee9d46d87 100644 --- a/modules/citelis/backend.py +++ b/modules/citelis/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from weboob.capabilities.bank import CapBank, AccountNotFound @@ -28,7 +28,7 @@ __all__ = ['CitelisBackend'] -class CitelisBackend(BaseBackend, CapBank): +class CitelisBackend(BaseModule, CapBank): NAME = 'citelis' DESCRIPTION = u'Citélis' MAINTAINER = u'Laurent Bachelier' diff --git a/modules/cmb/backend.py b/modules/cmb/backend.py index 5ebddbbd44db8dd3e17f97f6c417833ea7af4bd5..97194740913a2ed957ecc9749f671e0f7ae1d00a 100644 --- a/modules/cmb/backend.py +++ b/modules/cmb/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound from weboob.capabilities.bank import Account, Transaction -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['CmbBackend'] -class CmbBackend(BaseBackend, CapBank): +class CmbBackend(BaseModule, CapBank): NAME = 'cmb' MAINTAINER = u'Johann Broudin' EMAIL = 'Johann.Broudin@6-8.fr' diff --git a/modules/cmso/backend.py b/modules/cmso/backend.py index 2f0269f559afc9d1ae91672111e3632f5ff98022..e185f30699bc16b0d5734b05eb1bb95664182f34 100644 --- a/modules/cmso/backend.py +++ b/modules/cmso/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Cmso @@ -28,7 +28,7 @@ __all__ = ['CmsoBackend'] -class CmsoBackend(BaseBackend, CapBank): +class CmsoBackend(BaseModule, CapBank): NAME = 'cmso' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/colisprive/backend.py b/modules/colisprive/backend.py index d41de5f6bf1ef0a786e1c5fb23a1cdc716051589..73df1c4513a21119a313ac368d67654a374d45a1 100644 --- a/modules/colisprive/backend.py +++ b/modules/colisprive/backend.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . from weboob.capabilities.parcel import CapParcel -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import ColispriveBrowser __all__ = ['ColispriveBackend'] -class ColispriveBackend(BaseBackend, CapParcel): +class ColispriveBackend(BaseModule, CapParcel): NAME = 'colisprive' DESCRIPTION = u'Colisprive parcel tracking website' MAINTAINER = u'Florent Fourcot' diff --git a/modules/colissimo/backend.py b/modules/colissimo/backend.py index 0af59a6cc9f08d88589272d019688cb592a25e14..f51601f395cffa61f04fef41f97fe715f6255581 100644 --- a/modules/colissimo/backend.py +++ b/modules/colissimo/backend.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 BaseBackend +from weboob.tools.backend import BaseModule from .browser import ColissimoBrowser from datetime import date @@ -26,7 +26,7 @@ __all__ = ['ColissimoBackend'] -class ColissimoBackend(BaseBackend, CapParcel): +class ColissimoBackend(BaseModule, CapParcel): NAME = 'colissimo' DESCRIPTION = u'Colissimo parcel tracking website' MAINTAINER = u'Florent Fourcot' diff --git a/modules/cragr/backend.py b/modules/cragr/backend.py index 5c474ab75df52b8b701d950275926bfbf8adf64c..01835a538cb2238b0d5dc5996f4a735298a49a57 100644 --- a/modules/cragr/backend.py +++ b/modules/cragr/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import ValueBackendPassword, Value @@ -30,7 +30,7 @@ __all__ = ['CragrBackend'] -class CragrBackend(BaseBackend, CapBank): +class CragrBackend(BaseModule, CapBank): NAME = 'cragr' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/creditcooperatif/backend.py b/modules/creditcooperatif/backend.py index 057d8f82cdc92bfa8a1639e885c2ad0a67e345a3..d9b8cb10d58ebaf5f876f597f828ea99058bee95 100644 --- a/modules/creditcooperatif/backend.py +++ b/modules/creditcooperatif/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .perso.browser import CreditCooperatif as CreditCooperatifPerso @@ -29,7 +29,7 @@ __all__ = ['CreditCooperatifBackend'] -class CreditCooperatifBackend(BaseBackend, CapBank): +class CreditCooperatifBackend(BaseModule, CapBank): NAME = 'creditcooperatif' MAINTAINER = u'Kevin Pouget' EMAIL = 'weboob@kevin.pouget.me' diff --git a/modules/creditdunord/backend.py b/modules/creditdunord/backend.py index 449281d522a54bbd68d8045cd024ea524841e30d..a6201a59b3692a4f9d9e8df8b63c31663dff515f 100644 --- a/modules/creditdunord/backend.py +++ b/modules/creditdunord/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import ValueBackendPassword, Value @@ -30,7 +30,7 @@ __all__ = ['CreditDuNordBackend'] -class CreditDuNordBackend(BaseBackend, CapBank): +class CreditDuNordBackend(BaseModule, CapBank): NAME = 'creditdunord' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/creditmutuel/backend.py b/modules/creditmutuel/backend.py index 3b9b36c23e22085f6bbb077831823bb190413c71..ef6be0cdaa03ab6ba88059846112a106e99f5b68 100644 --- a/modules/creditmutuel/backend.py +++ b/modules/creditmutuel/backend.py @@ -24,7 +24,7 @@ import string from weboob.capabilities.bank import CapBank, AccountNotFound, Recipient, Account -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import CreditMutuelBrowser @@ -33,7 +33,7 @@ __all__ = ['CreditMutuelBackend'] -class CreditMutuelBackend(BaseBackend, CapBank): +class CreditMutuelBackend(BaseModule, CapBank): NAME = 'creditmutuel' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/cuisineaz/backend.py b/modules/cuisineaz/backend.py index d79cd73c6291194bc31b463f24a5432f7886e825..5a503e7371142469711759c4064b0eb17964897c 100644 --- a/modules/cuisineaz/backend.py +++ b/modules/cuisineaz/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule 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 CuisineazBackend(BaseBackend, CapRecipe): +class CuisineazBackend(BaseModule, CapRecipe): NAME = 'cuisineaz' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/dailymotion/backend.py b/modules/dailymotion/backend.py index 1e5ff7e6fcc3f8b69ecac382144f3459223bd6f4..ffd6dc916aeedd0e4805235334b58f07d32a60b4 100644 --- a/modules/dailymotion/backend.py +++ b/modules/dailymotion/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import DailymotionBrowser from .video import DailymotionVideo @@ -28,7 +28,7 @@ __all__ = ['DailymotionBackend'] -class DailymotionBackend(BaseBackend, CapVideo, CapCollection): +class DailymotionBackend(BaseModule, CapVideo, CapCollection): NAME = 'dailymotion' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/delubac/backend.py b/modules/delubac/backend.py index 6cb8779ac2a16c11c618b9c4a35c8a1597aeab1a..bd119931ba8865d572b600ab22a61429d02b42ac 100644 --- a/modules/delubac/backend.py +++ b/modules/delubac/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.bank import CapBank -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import DelubacBrowser @@ -27,7 +27,7 @@ __all__ = ['DelubacBackend'] -class DelubacBackend(BaseBackend, CapBank): +class DelubacBackend(BaseModule, CapBank): NAME = 'delubac' DESCRIPTION = u'Banque Delubac & Cie' MAINTAINER = u'Noe Rubinstein' diff --git a/modules/dlfp/backend.py b/modules/dlfp/backend.py index ec3d886eee0d604d3f4f2a4c09b35267b5e4b342..79760eeb8694371a9844aa0bdb3bd3e076b17387 100644 --- a/modules/dlfp/backend.py +++ b/modules/dlfp/backend.py @@ -23,7 +23,7 @@ from datetime import datetime, timedelta import time -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['DLFPBackend'] -class DLFPBackend(BaseBackend, CapMessages, CapMessagesPost, CapContent): +class DLFPBackend(BaseModule, CapMessages, CapMessagesPost, CapContent): NAME = 'dlfp' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/dresdenwetter/backend.py b/modules/dresdenwetter/backend.py index aa2b21877e19ca1e4885ae67f3780a1fc369dc0f..89cc1efa307b158ac8b4785dc4c2663f3df0724b 100644 --- a/modules/dresdenwetter/backend.py +++ b/modules/dresdenwetter/backend.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 BaseBackend +from weboob.tools.backend import BaseModule __all__ = ['DresdenWetterBackend'] -class DresdenWetterBackend(BaseBackend, CapGauge): +class DresdenWetterBackend(BaseModule, CapGauge): NAME = 'dresdenwetter' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/ebonics/backend.py b/modules/ebonics/backend.py index 52e906417b6d9380f2debf53000ecd7938508929..0b55f7e28883d693c9cdc68f8fe4fbf98146a5a7 100644 --- a/modules/ebonics/backend.py +++ b/modules/ebonics/backend.py @@ -21,14 +21,14 @@ import urllib from weboob.capabilities.translate import CapTranslate, Translation, TranslationFail, LanguageNotSupported -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.browser import StandardBrowser __all__ = ['EbonicsBackend'] -class EbonicsBackend(BaseBackend, CapTranslate): +class EbonicsBackend(BaseModule, CapTranslate): NAME = 'ebonics' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/edf/backend.py b/modules/edf/backend.py index 7c50146663a1c0455518b117ce7c365c4828c161..13cd3207b291fc596dbfb66a8e5a13915587d4b9 100644 --- a/modules/edf/backend.py +++ b/modules/edf/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import EdfBrowser __all__ = ['EdfBackend'] -class EdfBackend(BaseBackend, CapBill): +class EdfBackend(BaseModule, CapBill): NAME = 'edf' DESCRIPTION = u'Edf website: French power provider' MAINTAINER = u'Christophe Gouiran' diff --git a/modules/ehentai/backend.py b/modules/ehentai/backend.py index 1ca47c0c97944103fb3b47c7b844f32c016bf1b3..8a25f41291b72e4b410059aefd4f99a9864c415b 100644 --- a/modules/ehentai/backend.py +++ b/modules/ehentai/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.misc import ratelimit from weboob.tools.value import Value, ValueBackendPassword @@ -33,7 +33,7 @@ __all__ = ['EHentaiBackend'] -class EHentaiBackend(BaseBackend, CapGallery, CapCollection): +class EHentaiBackend(BaseModule, CapGallery, CapCollection): NAME = 'ehentai' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/europarl/backend.py b/modules/europarl/backend.py index 04778b75bd37c2fe0d7f9637f9dc5dae3eeaaa3f..b06c25fdbcbd854d5bfb4f5d3ca2fe9a58f9f839 100644 --- a/modules/europarl/backend.py +++ b/modules/europarl/backend.py @@ -22,7 +22,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.collection import CapCollection, CollectionNotFound from .browser import EuroparlBrowser @@ -32,7 +32,7 @@ __all__ = ['EuroparlBackend'] -class EuroparlBackend(BaseBackend, CapVideo, CapCollection): +class EuroparlBackend(BaseModule, CapVideo, CapCollection): NAME = 'europarl' MAINTAINER = u'François Revol' EMAIL = 'revol@free.fr' diff --git a/modules/feedly/backend.py b/modules/feedly/backend.py index d368a4e350a53ac579b3626e957adae6e4c2ec8f..267ac5edb323394721ff242e37e72d0cdcbf99f5 100644 --- a/modules/feedly/backend.py +++ b/modules/feedly/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['FeedlyBackend'] -class FeedlyBackend(BaseBackend, CapMessages, CapCollection): +class FeedlyBackend(BaseModule, CapMessages, CapCollection): NAME = 'feedly' DESCRIPTION = u'handle the popular RSS reading service Feedly' MAINTAINER = u'Bezleputh' diff --git a/modules/fortuneo/backend.py b/modules/fortuneo/backend.py index 87752c051ba992120422460e4bc129c4167cfea2..dc193476d5210fb6129468a31bc3cfb296910c21 100644 --- a/modules/fortuneo/backend.py +++ b/modules/fortuneo/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Fortuneo @@ -28,7 +28,7 @@ __all__ = ['FortuneoBackend'] -class FortuneoBackend(BaseBackend, CapBank): +class FortuneoBackend(BaseModule, CapBank): NAME = 'fortuneo' MAINTAINER = u'Gilles-Alexandre Quenot' EMAIL = 'gilles.quenot@gmail.com' diff --git a/modules/fourchan/backend.py b/modules/fourchan/backend.py index 17387a6ee01076244d773a1f58d041a0264450e5..cd90065535b929a4bb5fe16ae781fdbb6ae90cd6 100644 --- a/modules/fourchan/backend.py +++ b/modules/fourchan/backend.py @@ -21,7 +21,7 @@ from weboob.capabilities.messages import CapMessages, Message, Thread -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import Value from .browser import FourChan @@ -30,7 +30,7 @@ __all__ = ['FourChanBackend'] -class FourChanBackend(BaseBackend, CapMessages): +class FourChanBackend(BaseModule, CapMessages): NAME = 'fourchan' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/francetelevisions/backend.py b/modules/francetelevisions/backend.py index ffe37a43649562f7488cf6e71562b8ee89e13fdd..1d8633a6cb1d3a0ac694da390f0487d19ab9f555 100644 --- a/modules/francetelevisions/backend.py +++ b/modules/francetelevisions/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import PluzzBrowser @@ -28,7 +28,7 @@ __all__ = ['PluzzBackend'] -class PluzzBackend(BaseBackend, CapVideo, CapCollection): +class PluzzBackend(BaseModule, CapVideo, CapCollection): NAME = 'francetelevisions' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/freemobile/backend.py b/modules/freemobile/backend.py index 7100b11eadaa221b55fd09c2ffc1efe3ec19d7cb..8993578045c88cbe774a92f1a461d501f945dc76 100644 --- a/modules/freemobile/backend.py +++ b/modules/freemobile/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Freemobile @@ -28,7 +28,7 @@ __all__ = ['FreeMobileBackend'] -class FreeMobileBackend(BaseBackend, CapBill): +class FreeMobileBackend(BaseModule, CapBill): NAME = 'freemobile' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/ganassurances/backend.py b/modules/ganassurances/backend.py index eecc9801dacb7d1047c74eb9cb4a838fe0ac701f..2e0331fe12d50c6de3b45f3bf738297e254d0040 100644 --- a/modules/ganassurances/backend.py +++ b/modules/ganassurances/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import ValueBackendPassword, Value @@ -29,7 +29,7 @@ __all__ = ['GanAssurancesBackend'] -class GanAssurancesBackend(BaseBackend, CapBank): +class GanAssurancesBackend(BaseModule, CapBank): NAME = 'ganassurances' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/gazelle/backend.py b/modules/gazelle/backend.py index 936a001c796d97063437ef4ae688b63ab685fb31..d6925c73fa4772038ca89718c521a31138f44527 100644 --- a/modules/gazelle/backend.py +++ b/modules/gazelle/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.torrent import CapTorrent -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import GazelleBrowser @@ -27,7 +27,7 @@ __all__ = ['GazelleBackend'] -class GazelleBackend(BaseBackend, CapTorrent): +class GazelleBackend(BaseModule, CapTorrent): NAME = 'gazelle' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/gdcvault/backend.py b/modules/gdcvault/backend.py index 6be50e5d405087f7f7939014417df284ec151e87..ea232f33eed20a1c3d9437c4798864d7c55f8e0f 100644 --- a/modules/gdcvault/backend.py +++ b/modules/gdcvault/backend.py @@ -22,7 +22,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.capabilities.collection import CapCollection, CollectionNotFound from weboob.tools.value import Value, ValueBackendPassword @@ -33,7 +33,7 @@ __all__ = ['GDCVaultBackend'] -class GDCVaultBackend(BaseBackend, CapVideo, CapCollection): +class GDCVaultBackend(BaseModule, CapVideo, CapCollection): NAME = 'gdcvault' MAINTAINER = u'François Revol' EMAIL = 'revol@free.fr' diff --git a/modules/gdfsuez/backend.py b/modules/gdfsuez/backend.py index c11a8eaf1f582545ee4531f296b54f7c696b3ab2..5283c91e4abe93afcd01c3d5e63387a915cf382d 100644 --- a/modules/gdfsuez/backend.py +++ b/modules/gdfsuez/backend.py @@ -19,14 +19,14 @@ from weboob.capabilities.bill import CapBill, SubscriptionNotFound,\ BillNotFound, Subscription, Bill -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import GdfSuez __all__ = ['GdfSuezBackend'] -class GdfSuezBackend(BaseBackend, CapBill): +class GdfSuezBackend(BaseModule, CapBill): NAME = 'gdfsuez' MAINTAINER = u'Mathieu Jourdan' EMAIL = 'mathieu.jourdan@gresille.org' diff --git a/modules/geolocip/backend.py b/modules/geolocip/backend.py index 3f90f3fd79859d281b8f4c733938d0db142de22f..557e0b7c4dffe82bad2b47c02d650faca9d8060a 100644 --- a/modules/geolocip/backend.py +++ b/modules/geolocip/backend.py @@ -20,14 +20,14 @@ from weboob.capabilities.geolocip import CapGeolocIp, IpLocation -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.browser import BaseBrowser, BrowserUnavailable __all__ = ['GeolocIpBackend'] -class GeolocIpBackend(BaseBackend, CapGeolocIp): +class GeolocIpBackend(BaseModule, CapGeolocIp): NAME = 'geolocip' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/github/backend.py b/modules/github/backend.py index 4cf98ab6fb8f4118ac92e1778aa3c3d4fd53bdf1..2f8ec2ddc90884d98daef06e139d7c91fbb0c524 100644 --- a/modules/github/backend.py +++ b/modules/github/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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 GithubBackend(BaseBackend, CapBugTracker): +class GithubBackend(BaseModule, CapBugTracker): NAME = 'github' DESCRIPTION = u'GitHub issues tracking' MAINTAINER = u'Vincent A' diff --git a/modules/googletranslate/backend.py b/modules/googletranslate/backend.py index f89093b32a825cc9b66986b01067a10c65f1d733..08ad399b6412e28ea9e9f1ec116dce54a02bbeb8 100644 --- a/modules/googletranslate/backend.py +++ b/modules/googletranslate/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.translate import CapTranslate, Translation, TranslationFail, LanguageNotSupported -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import GoogleTranslateBrowser @@ -28,7 +28,7 @@ __all__ = ['GoogleTranslateBackend'] -class GoogleTranslateBackend(BaseBackend, CapTranslate): +class GoogleTranslateBackend(BaseModule, CapTranslate): MAINTAINER = u'Lucien Loiseau' EMAIL = 'loiseau.lucien@gmail.com' VERSION = '1.0' diff --git a/modules/grooveshark/backend.py b/modules/grooveshark/backend.py index 2a68bc597f1de267700bdc280d0e1d5570eddb9b..0397043b68ca107a60e2c9dd8a8294f16a9ffc02 100644 --- a/modules/grooveshark/backend.py +++ b/modules/grooveshark/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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 GroovesharkBackend(BaseBackend, CapAudio, CapCollection): +class GroovesharkBackend(BaseModule, CapAudio, CapCollection): NAME = 'grooveshark' DESCRIPTION = u'Grooveshark music streaming website' MAINTAINER = u'Bezleputh' diff --git a/modules/groupamaes/backend.py b/modules/groupamaes/backend.py index edf3661a2936a5c130e0039e71f2ead185eeeba8..eff451f3309f891109525247e874b13dca741840 100644 --- a/modules/groupamaes/backend.py +++ b/modules/groupamaes/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from weboob.capabilities.base import find_object @@ -28,7 +28,7 @@ __all__ = ['GroupamaesBackend'] -class GroupamaesBackend(BaseBackend, CapBank): +class GroupamaesBackend(BaseModule, CapBank): NAME = 'groupamaes' DESCRIPTION = u"Groupama Épargne Salariale" MAINTAINER = u'Bezleputh' diff --git a/modules/guerrillamail/backend.py b/modules/guerrillamail/backend.py index 17be9d5905d231d3db8047544d045c223a1d13fb..ce8b32d83b743efc089d28d5f22be5e400544f5b 100644 --- a/modules/guerrillamail/backend.py +++ b/modules/guerrillamail/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.capabilities.messages import CapMessages, CapMessagesPost, Thread, Message from weboob.tools.value import Value @@ -28,7 +28,7 @@ __all__ = ['GuerrillamailBackend'] -class GuerrillamailBackend(BaseBackend, CapMessages, CapMessagesPost): +class GuerrillamailBackend(BaseModule, CapMessages, CapMessagesPost): NAME = 'guerrillamail' DESCRIPTION = u'GuerrillaMail temp mailbox' MAINTAINER = u'Vincent A' diff --git a/modules/hds/backend.py b/modules/hds/backend.py index 903266ecc39d83249ac8df5d0c7161aff2df8a9d..754e66467112dbcf7a18237dd08eb72b4ecee86b 100644 --- a/modules/hds/backend.py +++ b/modules/hds/backend.py @@ -20,7 +20,7 @@ -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.messages import CapMessages, Message, Thread from .browser import HDSBrowser @@ -29,7 +29,7 @@ __all__ = ['HDSBackend'] -class HDSBackend(BaseBackend, CapMessages): +class HDSBackend(BaseModule, CapMessages): NAME = 'hds' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/hellobank/backend.py b/modules/hellobank/backend.py index e96af1afc989eae7476a87a0224f7813e250a065..43b012637b8ba37855fca7c378d7e5f6d15a3ca8 100644 --- a/modules/hellobank/backend.py +++ b/modules/hellobank/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import HelloBank @@ -33,7 +33,7 @@ __all__ = ['HelloBankBackend'] -class HelloBankBackend(BaseBackend, CapBank, CapMessages): +class HelloBankBackend(BaseModule, CapBank, CapMessages): NAME = 'hellobank' MAINTAINER = u'Christophe Lampin' EMAIL = 'weboob@lampin.net' @@ -49,7 +49,7 @@ class HelloBankBackend(BaseBackend, CapBank, CapMessages): CACHE_THREADS = timedelta(seconds=3 * 60 * 60) def __init__(self, *args, **kwargs): - BaseBackend.__init__(self, *args, **kwargs) + BaseModule.__init__(self, *args, **kwargs) self._threads = None self._threads_age = datetime.utcnow() diff --git a/modules/hsbc/backend.py b/modules/hsbc/backend.py index 826d45d78cea3dd2d0eadddefa3666d5fae7cb5f..2af4d8e1d2245a0baac859cfefe49c259087cc61 100644 --- a/modules/hsbc/backend.py +++ b/modules/hsbc/backend.py @@ -21,7 +21,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound from weboob.capabilities.base import find_object -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import HSBC @@ -30,7 +30,7 @@ __all__ = ['HSBCBackend'] -class HSBCBackend(BaseBackend, CapBank): +class HSBCBackend(BaseModule, CapBank): NAME = 'hsbc' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/hybride/backend.py b/modules/hybride/backend.py index 58b2a745344af6605a67c48101cba5cb3c93e786..ec1819e6bff075b5ca0920c32624e4d43b576b51 100644 --- a/modules/hybride/backend.py +++ b/modules/hybride/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES from .browser import HybrideBrowser @@ -27,7 +27,7 @@ __all__ = ['HybrideBackend'] -class HybrideBackend(BaseBackend, CapCalendarEvent): +class HybrideBackend(BaseModule, CapCalendarEvent): NAME = 'hybride' DESCRIPTION = u'hybride website' MAINTAINER = u'Bezleputh' diff --git a/modules/imdb/backend.py b/modules/imdb/backend.py index a118b020b95b94026ec19379e0f301d0bc69f320..2a5e634f7987c7fa458b5f9b09967bc65eddf52c 100644 --- a/modules/imdb/backend.py +++ b/modules/imdb/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.cinema import CapCinema, Person, Movie -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import ImdbBrowser @@ -27,7 +27,7 @@ __all__ = ['ImdbBackend'] -class ImdbBackend(BaseBackend, CapCinema): +class ImdbBackend(BaseModule, CapCinema): NAME = 'imdb' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/imgur/backend.py b/modules/imgur/backend.py index 4b9b92b3f6e1b0d6e9209543c39b06ce0b7e310b..ec62c41c00a8768d9e26623447d3e1ff597414c3 100644 --- a/modules/imgur/backend.py +++ b/modules/imgur/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule 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 ImgurBackend(BaseBackend, CapPaste): +class ImgurBackend(BaseModule, CapPaste): NAME = 'imgur' DESCRIPTION = u'imgur image upload service' MAINTAINER = u'Vincent A' diff --git a/modules/ina/backend.py b/modules/ina/backend.py index d5a43eb9b01a86163bf5c59428bab8de87f90dd0..6799350caa65c6812933d3c5a704188963f09c91 100644 --- a/modules/ina/backend.py +++ b/modules/ina/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.video import CapVideo -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import InaBrowser from .video import InaVideo @@ -28,7 +28,7 @@ __all__ = ['InaBackend'] -class InaBackend(BaseBackend, CapVideo): +class InaBackend(BaseModule, CapVideo): NAME = 'ina' MAINTAINER = u'Christophe Benz' EMAIL = 'christophe.benz@gmail.com' diff --git a/modules/indeed/backend.py b/modules/indeed/backend.py index eeeefa59d1874e1c2a300df74e687f0da8d2a9be..b2f03f1a00367f490add9b40b11987040a262c60 100644 --- a/modules/indeed/backend.py +++ b/modules/indeed/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['IndeedBackend'] -class IndeedBackend(BaseBackend, CapJob): +class IndeedBackend(BaseModule, CapJob): NAME = 'indeed' DESCRIPTION = u'indeed website' MAINTAINER = u'Bezleputh' diff --git a/modules/ing/backend.py b/modules/ing/backend.py index 316f8962db889030b4a25700633377204922f5ca..3eeda0d21eb1e74a020e3f3f579bebac54d67ba5 100644 --- a/modules/ing/backend.py +++ b/modules/ing/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import IngBrowser @@ -31,7 +31,7 @@ __all__ = ['INGBackend'] -class INGBackend(BaseBackend, CapBank, CapBill): +class INGBackend(BaseModule, CapBank, CapBill): NAME = 'ing' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/ipinfodb/backend.py b/modules/ipinfodb/backend.py index 7ece27b3eb11ff469bdc2a3bf725dbadd8cd8c04..ccc7b2ac4f9716be249245a7800fb712eb904107 100644 --- a/modules/ipinfodb/backend.py +++ b/modules/ipinfodb/backend.py @@ -20,14 +20,14 @@ from weboob.capabilities.geolocip import CapGeolocIp, IpLocation -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.browser import StandardBrowser __all__ = ['IpinfodbBackend'] -class IpinfodbBackend(BaseBackend, CapGeolocIp): +class IpinfodbBackend(BaseModule, CapGeolocIp): NAME = 'ipinfodb' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/izneo/backend.py b/modules/izneo/backend.py index edd21b84aa145bb93b5c44d0dfb0dfca1adeddb1..c9cc5f54b23ad5b2b075e7f2b254d29db8c3c774 100644 --- a/modules/izneo/backend.py +++ b/modules/izneo/backend.py @@ -23,7 +23,7 @@ from weboob.capabilities.gallery import CapGallery, BaseGallery, BaseImage from weboob.tools.json import json -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.browser import BaseBrowser, BasePage __all__ = ['IzneoBackend'] @@ -61,7 +61,7 @@ def fill_image(self, image, fields): image.url, None, {'Referer': image.gallery.url})) -class IzneoBackend(BaseBackend, CapGallery): +class IzneoBackend(BaseModule, CapGallery): NAME = 'izneo' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/jacquieetmichel/backend.py b/modules/jacquieetmichel/backend.py index 8a776e97c2490702c1955aac62300b8034660b14..5ffd170b54e26cd30d85a1bcbed743d0e479657b 100644 --- a/modules/jacquieetmichel/backend.py +++ b/modules/jacquieetmichel/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import JacquieEtMichelBrowser from .video import JacquieEtMichelVideo @@ -28,7 +28,7 @@ __all__ = ['JacquieEtMichelBackend'] -class JacquieEtMichelBackend(BaseBackend, CapVideo, CapCollection): +class JacquieEtMichelBackend(BaseModule, CapVideo, CapCollection): NAME = 'jacquieetmichel' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/jcvelaux/backend.py b/modules/jcvelaux/backend.py index 0897f697ed43be2f171261fd628775ca8b49dd87..9e2c3d9aca4871fb7db6a26a82263b0ee0440eed 100644 --- a/modules/jcvelaux/backend.py +++ b/modules/jcvelaux/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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 jcvelauxBackend(BaseBackend, CapGauge): +class jcvelauxBackend(BaseModule, CapGauge): NAME = 'jcvelaux' DESCRIPTION = (u'City bike renting availability information.\nCities: %s' % u', '.join(CITIES)) diff --git a/modules/jvmalin/backend.py b/modules/jvmalin/backend.py index 57b01adf7937bcfddfeb20589f9af17ec8b4a1ff..c09bd816e5031ddb9c0e4039ce54e14c8ee7a806 100644 --- a/modules/jvmalin/backend.py +++ b/modules/jvmalin/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.travel import CapTravel, RoadStep -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import JVMalin @@ -26,7 +26,7 @@ __all__ = ['JVMalinBackend'] -class JVMalinBackend(BaseBackend, CapTravel): +class JVMalinBackend(BaseModule, CapTravel): NAME = 'jvmalin' MAINTAINER = u'Alexandre Lissy' EMAIL = 'github@lissy.me' diff --git a/modules/kickass/backend.py b/modules/kickass/backend.py index f27dde76774c1f4c2ef0902e498f3cdec9cec416..06ae9fa41d5b15e010fe1ec75f6667114f71015c 100644 --- a/modules/kickass/backend.py +++ b/modules/kickass/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.torrent import CapTorrent, Torrent -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import KickassBrowser @@ -29,7 +29,7 @@ __all__ = ['KickassBackend'] -class KickassBackend(BaseBackend, CapTorrent): +class KickassBackend(BaseModule, CapTorrent): NAME = 'kickass' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/lacentrale/backend.py b/modules/lacentrale/backend.py index e009a210a1ddef8e796324d561b53c8c72b84ffb..07e62a5e1244c748471c6cd066d3cd1ae7ba0ea4 100644 --- a/modules/lacentrale/backend.py +++ b/modules/lacentrale/backend.py @@ -19,7 +19,7 @@ import re from weboob.capabilities.pricecomparison import CapPriceComparison, Price -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule #from weboob.tools.value import Value from .browser import LaCentraleBrowser @@ -29,7 +29,7 @@ # I implement capability -class LaCentraleBackend(BaseBackend, CapPriceComparison): +class LaCentraleBackend(BaseModule, CapPriceComparison): NAME = 'lacentrale' MAINTAINER = u'Vicnet' EMAIL = 'vo.publique@gmail.com' diff --git a/modules/lcl/backend.py b/modules/lcl/backend.py index 08a1ed847dcc14b7c4cfef7da0682e6d46ce5009..5b5816a9616e75bac67617e8f0d73a4bab857012 100644 --- a/modules/lcl/backend.py +++ b/modules/lcl/backend.py @@ -21,7 +21,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import LCLBrowser, LCLProBrowser @@ -31,7 +31,7 @@ __all__ = ['LCLBackend'] -class LCLBackend(BaseBackend, CapBank): +class LCLBackend(BaseModule, CapBank): NAME = 'lcl' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/leclercmobile/backend.py b/modules/leclercmobile/backend.py index 2a54e79acfd06fc2909a8a2540429f649ae70910..7bd3e842f506e9cd04ae72f827d0d172c8f09cd4 100644 --- a/modules/leclercmobile/backend.py +++ b/modules/leclercmobile/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.bill import CapBill, SubscriptionNotFound,\ BillNotFound, Subscription, Bill -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Leclercmobile @@ -29,7 +29,7 @@ __all__ = ['LeclercMobileBackend'] -class LeclercMobileBackend(BaseBackend, CapBill): +class LeclercMobileBackend(BaseModule, CapBill): NAME = 'leclercmobile' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/lolix/backend.py b/modules/lolix/backend.py index 3937787f84cbb74ec69afb6490ef3f9c3d3acece..36ae57038a8ac97f2c9504f9b5c6b258722d532c 100644 --- a/modules/lolix/backend.py +++ b/modules/lolix/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.ordereddict import OrderedDict from weboob.tools.value import Value from weboob.capabilities.job import CapJob @@ -28,7 +28,7 @@ __all__ = ['LolixBackend'] -class LolixBackend(BaseBackend, CapJob): +class LolixBackend(BaseModule, CapJob): NAME = 'lolix' DESCRIPTION = u'Lolix French free software employment website' MAINTAINER = u'Bezleputh' diff --git a/modules/lutim/backend.py b/modules/lutim/backend.py index ac16fd0ceb33eecbacab37ffca620935ecf05720..998e769c0c94c999394faf1c103083db6a713692 100644 --- a/modules/lutim/backend.py +++ b/modules/lutim/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['LutimBackend'] -class LutimBackend(BaseBackend, CapPaste): +class LutimBackend(BaseModule, CapPaste): NAME = 'lutim' DESCRIPTION = u'LUTIm website' MAINTAINER = u'Vincent A' diff --git a/modules/mailinator/backend.py b/modules/mailinator/backend.py index c24dfdf72887023e5a17dbc73d909cfe41e4ef20..1a2cad66bac788ddcf681e8b83d2e3a858e5a8e7 100644 --- a/modules/mailinator/backend.py +++ b/modules/mailinator/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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 MailinatorBackend(BaseBackend, CapMessages): +class MailinatorBackend(BaseModule, CapMessages): NAME = 'mailinator' DESCRIPTION = u'mailinator temp mailbox' MAINTAINER = u'Vincent A' diff --git a/modules/mareeinfo/backend.py b/modules/mareeinfo/backend.py index 02e1de884db7363336cffe5a84ebd421c544061f..0754d8e33a9a54432f91aa4fa8280610c72172d9 100644 --- a/modules/mareeinfo/backend.py +++ b/modules/mareeinfo/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.base import find_object from weboob.capabilities.gauge import CapGauge, Gauge, SensorNotFound from .browser import MareeinfoBrowser @@ -27,7 +27,7 @@ __all__ = ['MareeinfoBackend'] -class MareeinfoBackend(BaseBackend, CapGauge): +class MareeinfoBackend(BaseModule, 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/backend.py b/modules/marmiton/backend.py index 4a8836742c67f9e03fe40721f72fa10002bd8905..572d1e5971cd23da7b9957d350d6361890e69c65 100644 --- a/modules/marmiton/backend.py +++ b/modules/marmiton/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import MarmitonBrowser @@ -27,7 +27,7 @@ __all__ = ['MarmitonBackend'] -class MarmitonBackend(BaseBackend, CapRecipe): +class MarmitonBackend(BaseModule, CapRecipe): NAME = 'marmiton' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/mediawiki/backend.py b/modules/mediawiki/backend.py index 226d7fe0d5d81fb64a2ea90b05a865ff4112fac1..edf20714fb934a900b0335c873e3a10994c5cdd4 100644 --- a/modules/mediawiki/backend.py +++ b/modules/mediawiki/backend.py @@ -19,7 +19,7 @@ -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.capabilities.content import CapContent, Content from weboob.tools.value import ValueBackendPassword, Value @@ -30,7 +30,7 @@ __all__ = ['MediawikiBackend'] -class MediawikiBackend(BaseBackend, CapContent): +class MediawikiBackend(BaseModule, CapContent): NAME = 'mediawiki' MAINTAINER = u'Clément Schreiner' EMAIL = 'clemux@clemux.info' diff --git a/modules/meteofrance/backend.py b/modules/meteofrance/backend.py index 874bc70074792dc288e8a86d23a4b3c41ed05fbd..1a5b5522ad49bcc986d741adf7e35726c65a36cb 100644 --- a/modules/meteofrance/backend.py +++ b/modules/meteofrance/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.weather import CapWeather -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import MeteofranceBrowser @@ -27,7 +27,7 @@ __all__ = ['MeteofranceBackend'] -class MeteofranceBackend(BaseBackend, CapWeather): +class MeteofranceBackend(BaseModule, CapWeather): NAME = 'meteofrance' MAINTAINER = u'Cedric Defortis' EMAIL = 'cedric@aiur.fr' diff --git a/modules/monster/backend.py b/modules/monster/backend.py index bc82310264bbc732ac28a6e4fec2b67138b98448..ca1a3b5b5354c62bf8281e93abbd0a3c8794806d 100644 --- a/modules/monster/backend.py +++ b/modules/monster/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.capabilities.job import CapJob from weboob.tools.value import Value from weboob.tools.ordereddict import OrderedDict @@ -29,7 +29,7 @@ __all__ = ['MonsterBackend'] -class MonsterBackend(BaseBackend, CapJob): +class MonsterBackend(BaseModule, CapJob): NAME = 'monster' DESCRIPTION = u'monster website' MAINTAINER = u'Bezleputh' diff --git a/modules/nectarine/backend.py b/modules/nectarine/backend.py index 64144c04ef6a3aae6cbc1b7c6e568cad81f90fa8..b493864459196c5ada09b21e819d0c96aacaf82d 100644 --- a/modules/nectarine/backend.py +++ b/modules/nectarine/backend.py @@ -18,12 +18,12 @@ from weboob.capabilities.radio import CapRadio, Radio from weboob.capabilities.collection import CapCollection -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import NectarineBrowser __all__ = ['NectarineBackend'] -class NectarineBackend(BaseBackend, CapRadio, CapCollection): +class NectarineBackend(BaseModule, CapRadio, CapCollection): NAME = 'nectarine' MAINTAINER = u'Thomas Lecavelier' EMAIL = 'thomas-weboob@lecavelier.name' diff --git a/modules/nettokom/backend.py b/modules/nettokom/backend.py index d2675c942c43c1d2b7538f3ba24d1c6c9e04472c..4fb26edd5bb3c021dc2660708a9d827aa1d9ca19 100644 --- a/modules/nettokom/backend.py +++ b/modules/nettokom/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.bill import CapBill, Subscription, SubscriptionNotFound, Detail -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Nettokom @@ -29,7 +29,7 @@ __all__ = ['NettoKomBackend'] -class NettoKomBackend(BaseBackend, CapBill): +class NettoKomBackend(BaseModule, CapBill): NAME = 'nettokom' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/newsfeed/backend.py b/modules/newsfeed/backend.py index e36172942ba754d459f4e6ce640345ec9370b616..9563cfaaa71fa906d77a4476951b765e4033fe4d 100644 --- a/modules/newsfeed/backend.py +++ b/modules/newsfeed/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['NewsfeedBackend'] -class NewsfeedBackend(BaseBackend, CapMessages): +class NewsfeedBackend(BaseModule, CapMessages): NAME = 'newsfeed' MAINTAINER = u'Clément Schreiner' EMAIL = "clemux@clemux.info" diff --git a/modules/nihonnooto/backend.py b/modules/nihonnooto/backend.py index 4a55f2fecfac6bec99db73499903501179e15258..4fcc0bfed4ef2058e1996bdf499ad91c341cac68 100644 --- a/modules/nihonnooto/backend.py +++ b/modules/nihonnooto/backend.py @@ -18,12 +18,12 @@ from weboob.capabilities.radio import CapRadio, Radio from weboob.capabilities.collection import CapCollection -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import NihonNoOtoBrowser __all__ = ['NihonNoOtoBackend'] -class NihonNoOtoBackend(BaseBackend, CapRadio, CapCollection): +class NihonNoOtoBackend(BaseModule, CapRadio, CapCollection): NAME = 'nihonnooto' MAINTAINER = u'Thomas Lecavelier' EMAIL = 'thomas-weboob@lecavelier.name' diff --git a/modules/nolifetv/backend.py b/modules/nolifetv/backend.py index 85bc35fd64c0944f2b5ceb59561338489a0981df..525803d4a3fa9f4609c1860c5c925f831714a5bc 100644 --- a/modules/nolifetv/backend.py +++ b/modules/nolifetv/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from .browser import NolifeTVBrowser from .video import NolifeTVVideo @@ -31,7 +31,7 @@ __all__ = ['NolifeTVBackend'] -class NolifeTVBackend(BaseBackend, CapVideo, CapCollection): +class NolifeTVBackend(BaseModule, CapVideo, CapCollection): NAME = 'nolifetv' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/nova/backend.py b/modules/nova/backend.py index 262a539764b984c649cd136d625e6ddd43a902ef..bf406ca54b022eb4e6dabd3b1b2fbe0a037fd887 100644 --- a/modules/nova/backend.py +++ b/modules/nova/backend.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 BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.browser import StandardBrowser from weboob.tools.parsers import get_parser @@ -32,7 +32,7 @@ __all__ = ['NovaBackend'] -class NovaBackend(BaseBackend, CapRadio, CapCollection): +class NovaBackend(BaseModule, CapRadio, CapCollection): NAME = 'nova' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/okc/backend.py b/modules/okc/backend.py index be40688962d8e36f5498e156f05198474fb6b2b8..c867c2746755b690cf2e9136b55420086d9a234d 100644 --- a/modules/okc/backend.py +++ b/modules/okc/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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 OkCBackend(BaseBackend, CapMessages, CapContact, CapMessagesPost, CapDating): +class OkCBackend(BaseModule, CapMessages, CapContact, CapMessagesPost, CapDating): NAME = 'okc' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/oney/backend.py b/modules/oney/backend.py index 4a1c4737be52fdcb54709579d5099c26cec1f32c..3c6cc5a2845d97b4702bbc86312abf2e599b5fcc 100644 --- a/modules/oney/backend.py +++ b/modules/oney/backend.py @@ -21,7 +21,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound from weboob.capabilities.base import find_object -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import OneyBrowser @@ -30,7 +30,7 @@ __all__ = ['OneyBackend'] -class OneyBackend(BaseBackend, CapBank): +class OneyBackend(BaseModule, CapBank): NAME = 'oney' MAINTAINER = u'Vincet Paredes' EMAIL = 'vparedes@budget-insight.com' diff --git a/modules/opacwebaloes/backend.py b/modules/opacwebaloes/backend.py index 456983324d2fc187bd59c201a807b72dcfaa0166..56b10c1c2b9dd32c22c0cacaec5fd555d5874a11 100644 --- a/modules/opacwebaloes/backend.py +++ b/modules/opacwebaloes/backend.py @@ -21,7 +21,7 @@ from weboob.capabilities.library import CapBook -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import AloesBrowser @@ -30,7 +30,7 @@ __all__ = ['AloesBackend'] -class AloesBackend(BaseBackend, CapBook): +class AloesBackend(BaseModule, CapBook): NAME = 'opacwebaloes' MAINTAINER = u'Jeremy Monnet' EMAIL = 'jmonnet@gmail.com' diff --git a/modules/opensubtitles/backend.py b/modules/opensubtitles/backend.py index a11708d6736820ed68761f0d09fed25e41892aa9..a01896fe8e7590811f2ad6fa5f0ec1670df97531 100644 --- a/modules/opensubtitles/backend.py +++ b/modules/opensubtitles/backend.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 BaseBackend +from weboob.tools.backend import BaseModule from .browser import OpensubtitlesBrowser @@ -28,7 +28,7 @@ __all__ = ['OpensubtitlesBackend'] -class OpensubtitlesBackend(BaseBackend, CapSubtitle): +class OpensubtitlesBackend(BaseModule, CapSubtitle): NAME = 'opensubtitles' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/orange/backend.py b/modules/orange/backend.py index 60164a0514bad516abd3096bc829b85b3996f7bc..f54ffb2e9ae2cd5e641ce26c0ca0c585242604e8 100644 --- a/modules/orange/backend.py +++ b/modules/orange/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword, Value from .browser import OrangeBrowser @@ -31,7 +31,7 @@ __all__ = ['OrangeBackend'] -class OrangeBackend(BaseBackend, CapAccount, CapMessages, CapMessagesPost): +class OrangeBackend(BaseModule, CapAccount, CapMessages, CapMessagesPost): NAME = 'orange' MAINTAINER = u'Nicolas Duhamel' EMAIL = 'nicolas@jombi.fr' diff --git a/modules/ouifm/backend.py b/modules/ouifm/backend.py index b3217b4e4fc06016fe544971a4f8d48051e05a01..457f5bba5513c76757c1fae877c8057f73a4132a 100644 --- a/modules/ouifm/backend.py +++ b/modules/ouifm/backend.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 BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.browser import StandardBrowser from weboob.tools.misc import to_unicode @@ -30,7 +30,7 @@ __all__ = ['OuiFMBackend'] -class OuiFMBackend(BaseBackend, CapRadio, CapCollection): +class OuiFMBackend(BaseModule, CapRadio, CapCollection): NAME = 'ouifm' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/ovs/backend.py b/modules/ovs/backend.py index 51863c5b7f7a3111e00146c8f6920eef9f603cb7..e41f9e274c331a7c7632b0ce2f09aff0efff6194 100644 --- a/modules/ovs/backend.py +++ b/modules/ovs/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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 OvsBackend(BaseBackend, CapMessages, CapMessagesPost, CapContact): +class OvsBackend(BaseModule, CapMessages, CapMessagesPost, CapContact): NAME = 'ovs' DESCRIPTION = u'OnVaSortir website. Handles private messages only' MAINTAINER = u'Vincent A' diff --git a/modules/pap/backend.py b/modules/pap/backend.py index 7ac9696248d0ff9154068e45c27fcbc8995d6588..719796f8b2d5661ddcf8b26e35e00ea59d1b8fe8 100644 --- a/modules/pap/backend.py +++ b/modules/pap/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.housing import CapHousing, City, Housing, HousingPhoto -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import PapBrowser @@ -28,7 +28,7 @@ __all__ = ['PapBackend'] -class PapBackend(BaseBackend, CapHousing): +class PapBackend(BaseModule, CapHousing): NAME = 'pap' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/pariskiwi/backend.py b/modules/pariskiwi/backend.py index 393c271504b0909685ef3e887d958c16c08212e3..d9c6c9402c88127f2c764a427e71ee1339733769 100644 --- a/modules/pariskiwi/backend.py +++ b/modules/pariskiwi/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.calendar import CapCalendarEvent, BaseCalendarEvent, CATEGORIES, TRANSP, STATUS from datetime import datetime, time @@ -28,7 +28,7 @@ __all__ = ['ParisKiwiBackend'] -class ParisKiwiBackend(BaseBackend, CapCalendarEvent): +class ParisKiwiBackend(BaseModule, CapCalendarEvent): NAME = 'pariskiwi' DESCRIPTION = u'ParisKiwi website' MAINTAINER = u'Vincent A' diff --git a/modules/parolesmania/backend.py b/modules/parolesmania/backend.py index 22af0a0118f68a596fdea493404d671674fda79f..ee56535da47480532ca4231f20ec5e1ec6606c86 100644 --- a/modules/parolesmania/backend.py +++ b/modules/parolesmania/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.lyrics import CapLyrics, SongLyrics -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import ParolesmaniaBrowser @@ -27,7 +27,7 @@ __all__ = ['ParolesmaniaBackend'] -class ParolesmaniaBackend(BaseBackend, CapLyrics): +class ParolesmaniaBackend(BaseModule, CapLyrics): NAME = 'parolesmania' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/parolesmusique/backend.py b/modules/parolesmusique/backend.py index 3c3809571e47c3e80e7e58e71dfa2bcb3e117a89..3b0e369cc147e8f19b7f4c292dca20b576f3ecea 100644 --- a/modules/parolesmusique/backend.py +++ b/modules/parolesmusique/backend.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . from weboob.capabilities.lyrics import CapLyrics, SongLyrics -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import ParolesmusiqueBrowser __all__ = ['ParolesmusiqueBackend'] -class ParolesmusiqueBackend(BaseBackend, CapLyrics): +class ParolesmusiqueBackend(BaseModule, CapLyrics): NAME = 'parolesmusique' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/parolesnet/backend.py b/modules/parolesnet/backend.py index 56b62ea76100766437b362b50799489c3ad054e5..18afa1233da985e2a4b749884b4c75a7049f004e 100644 --- a/modules/parolesnet/backend.py +++ b/modules/parolesnet/backend.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . from weboob.capabilities.lyrics import CapLyrics, SongLyrics -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import ParolesnetBrowser __all__ = ['ParolesnetBackend'] -class ParolesnetBackend(BaseBackend, CapLyrics): +class ParolesnetBackend(BaseModule, CapLyrics): NAME = 'parolesnet' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/pastealacon/backend.py b/modules/pastealacon/backend.py index bc23b0214c39b8f8fea1000d4ccbf36ea49a3f83..8c70fd23677e59a27aace280e1fd57cc25543e94 100644 --- a/modules/pastealacon/backend.py +++ b/modules/pastealacon/backend.py @@ -21,13 +21,13 @@ import re from weboob.tools.capabilities.paste import BasePasteBackend -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.base import NotLoaded from .browser import PastealaconBrowser, PastealaconPaste -class PastealaconBackend(BaseBackend, BasePasteBackend): +class PastealaconBackend(BaseModule, BasePasteBackend): NAME = 'pastealacon' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/modules/pastebin/backend.py b/modules/pastebin/backend.py index dea58715bc6002e7100ce2f9c9a996f854149dcf..0a39071b6f797f451e79606f253f696b49a83637 100644 --- a/modules/pastebin/backend.py +++ b/modules/pastebin/backend.py @@ -19,14 +19,14 @@ from weboob.capabilities.base import NotLoaded -from weboob.tools.backend import BackendConfig, BaseBackend +from weboob.tools.backend import BackendConfig, BaseModule from weboob.tools.capabilities.paste import BasePasteBackend from weboob.tools.value import Value, ValueBackendPassword from .browser import PastebinBrowser, PastebinPaste -class PastebinBackend(BaseBackend, BasePasteBackend): +class PastebinBackend(BaseModule, BasePasteBackend): NAME = 'pastebin' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/modules/paypal/backend.py b/modules/paypal/backend.py index 93cc5b2ea75526e9b49c1eceb63ef18ccddd2bf5..f5e45328ef2ec63ea13f7febaf428e2458c77f89 100644 --- a/modules/paypal/backend.py +++ b/modules/paypal/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import Paypal @@ -28,7 +28,7 @@ __all__ = ['PaypalBackend'] -class PaypalBackend(BaseBackend, CapBank): +class PaypalBackend(BaseModule, CapBank): NAME = 'paypal' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/modules/phpbb/backend.py b/modules/phpbb/backend.py index 5e5e51998822c898959e163726bf38c253693c66..7f2c541cbc11d0ec960462504fcfba6ee4cb8b4c 100644 --- a/modules/phpbb/backend.py +++ b/modules/phpbb/backend.py @@ -20,7 +20,7 @@ -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['PhpBBBackend'] -class PhpBBBackend(BaseBackend, CapMessages, CapMessagesPost): +class PhpBBBackend(BaseModule, CapMessages, CapMessagesPost): NAME = 'phpbb' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/piratebay/backend.py b/modules/piratebay/backend.py index 1e47fbe949485980a566e04ab7914c0f4b7fd0db..ffe7f7964a545d0b34670cf4b0ffa5b5760b48cb 100644 --- a/modules/piratebay/backend.py +++ b/modules/piratebay/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.torrent import CapTorrent, MagnetOnly, Torrent -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import Value from weboob.capabilities.base import NotAvailable @@ -28,7 +28,7 @@ __all__ = ['PiratebayBackend'] -class PiratebayBackend(BaseBackend, CapTorrent): +class PiratebayBackend(BaseModule, CapTorrent): NAME = 'piratebay' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/pixtoilelibre/backend.py b/modules/pixtoilelibre/backend.py index cc50c646a3ca3b25b1ffaa951ea7b53c12c2cce2..2605b1ef0226ce41aa9376b52ef6db4b74a96ce3 100644 --- a/modules/pixtoilelibre/backend.py +++ b/modules/pixtoilelibre/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule 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 PixtoilelibreBackend(BaseBackend, CapPaste): +class PixtoilelibreBackend(BaseModule, CapPaste): NAME = 'pixtoilelibre' DESCRIPTION = u'toile-libre image hosting website' MAINTAINER = u'Vincent A' diff --git a/modules/podnapisi/backend.py b/modules/podnapisi/backend.py index 49ec60b8c4285e527c3429d34d00b265800a7d0f..9ae6388e69b38bf843bd8b60079e4a2e73f5c3db 100644 --- a/modules/podnapisi/backend.py +++ b/modules/podnapisi/backend.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 BaseBackend +from weboob.tools.backend import BaseModule from .browser import PodnapisiBrowser @@ -28,7 +28,7 @@ __all__ = ['PodnapisiBackend'] -class PodnapisiBackend(BaseBackend, CapSubtitle): +class PodnapisiBackend(BaseModule, CapSubtitle): NAME = 'podnapisi' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/poivy/backend.py b/modules/poivy/backend.py index 50c09e8c18dae08a10e8f2bca26fca8d57bbb627..0eea0f30d09ce985a18a7c2ebfa1a193534921f0 100644 --- a/modules/poivy/backend.py +++ b/modules/poivy/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import PoivyBrowser @@ -29,7 +29,7 @@ __all__ = ['PoivyBackend'] -class PoivyBackend(BaseBackend, CapBill): +class PoivyBackend(BaseModule, CapBill): NAME = 'poivy' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/popolemploi/backend.py b/modules/popolemploi/backend.py index 1465b33ba4c5774c1a3cdda7b807e10c71a0580a..3dbeb98c40764b4d0c83a874dc7933bfe33ecfc0 100644 --- a/modules/popolemploi/backend.py +++ b/modules/popolemploi/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.capabilities.job import CapJob from weboob.tools.value import Value from weboob.tools.ordereddict import OrderedDict @@ -29,7 +29,7 @@ __all__ = ['PopolemploiBackend'] -class PopolemploiBackend(BaseBackend, CapJob): +class PopolemploiBackend(BaseModule, CapJob): NAME = 'popolemploi' DESCRIPTION = u'Pole Emploi website' MAINTAINER = u'Bezleputh' diff --git a/modules/prixcarburants/backend.py b/modules/prixcarburants/backend.py index c013b9a59660d8830a81cfe11ccfd0a735e5ca8b..af8abe5b90267834c0a0136be03ecb6b3c679682 100644 --- a/modules/prixcarburants/backend.py +++ b/modules/prixcarburants/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import Value from weboob.capabilities.pricecomparison import CapPriceComparison, Price, Product @@ -27,7 +27,7 @@ __all__ = ['PrixCarburantsBackend'] -class PrixCarburantsBackend(BaseBackend, CapPriceComparison): +class PrixCarburantsBackend(BaseModule, CapPriceComparison): NAME = 'prixcarburants' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/quvi/backend.py b/modules/quvi/backend.py index 2d46379e9971f20c888a518f5113d6bf5a36cb00..de400f564b15b019a43aa5a729fd95437dfc3421 100644 --- a/modules/quvi/backend.py +++ b/modules/quvi/backend.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 BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.misc import to_unicode from quvi import LibQuvi, QuviError @@ -37,7 +37,7 @@ __all__ = ['QuviBackend', 'QuviVideo'] -class QuviBackend(BaseBackend, CapVideo): +class QuviBackend(BaseModule, 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/backend.py b/modules/radiofrance/backend.py index 4cc197502106028ff74aff025531e68d4dcb4b3d..0675caaaf9aa27e90bfbeee9b564513c7525e98d 100644 --- a/modules/radiofrance/backend.py +++ b/modules/radiofrance/backend.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 BaseBackend +from weboob.tools.backend import BaseModule from .browser import RadioFranceBrowser, RadioFranceVideo @@ -33,7 +33,7 @@ __all__ = ['RadioFranceBackend'] -class RadioFranceBackend(BaseBackend, CapRadio, CapCollection, CapVideo): +class RadioFranceBackend(BaseModule, CapRadio, CapCollection, CapVideo): NAME = 'radiofrance' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/modules/razibus/backend.py b/modules/razibus/backend.py index e6bf170f371f36c51329b9e2bd1b5665acaa3c3d..ce82d56fadcc8a065a212b3421ef31fddd749a48 100644 --- a/modules/razibus/backend.py +++ b/modules/razibus/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['RazibusBackend'] -class RazibusBackend(BaseBackend, CapCalendarEvent): +class RazibusBackend(BaseModule, 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/backend.py b/modules/redmine/backend.py index d4d2d0865b096ec36f2c2cc36f55c85c33e42137..1d5b46c3223a9b77af828a50791728dac89758ee 100644 --- a/modules/redmine/backend.py +++ b/modules/redmine/backend.py @@ -25,7 +25,7 @@ Version, Status, Update, Attachment, \ Query, Change from weboob.capabilities.collection import CapCollection, Collection, CollectionNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.exceptions import BrowserHTTPNotFound from weboob.tools.value import ValueBackendPassword, Value @@ -35,7 +35,7 @@ __all__ = ['RedmineBackend'] -class RedmineBackend(BaseBackend, CapContent, CapBugTracker, CapCollection): +class RedmineBackend(BaseModule, CapContent, CapBugTracker, CapCollection): NAME = 'redmine' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/regionsjob/backend.py b/modules/regionsjob/backend.py index 9d55fd76268c9043c525f590f2dd16fcd408b3b6..7a590047beeb0f940750bb212cb2cfdbe5637039 100644 --- a/modules/regionsjob/backend.py +++ b/modules/regionsjob/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.capabilities.job import CapJob, BaseJobAdvert from .browser import RegionsjobBrowser from weboob.tools.ordereddict import OrderedDict @@ -28,7 +28,7 @@ __all__ = ['RegionsjobBackend'] -class RegionsjobBackend(BaseBackend, CapJob): +class RegionsjobBackend(BaseModule, CapJob): NAME = 'regionsjob' DESCRIPTION = u'regionsjob website' MAINTAINER = u'Bezleputh' diff --git a/modules/sachsen/backend.py b/modules/sachsen/backend.py index 51a57bf961f4d86e0d7d1417a5565371da830e2a..3c2ab15de8eb5437b817c21407b0a1a5a737ef75 100644 --- a/modules/sachsen/backend.py +++ b/modules/sachsen/backend.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 BaseBackend +from weboob.tools.backend import BaseModule __all__ = ['SachsenLevelBackend'] -class SachsenLevelBackend(BaseBackend, CapGauge): +class SachsenLevelBackend(BaseModule, CapGauge): NAME = 'sachsen' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/seeklyrics/backend.py b/modules/seeklyrics/backend.py index 48a27a78f048383cc162f2286c141371db7e189e..b40b7c5b2bed2a0cd47172d5b3c9cd774991f233 100644 --- a/modules/seeklyrics/backend.py +++ b/modules/seeklyrics/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.lyrics import CapLyrics, SongLyrics -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import SeeklyricsBrowser @@ -27,7 +27,7 @@ __all__ = ['SeeklyricsBackend'] -class SeeklyricsBackend(BaseBackend, CapLyrics): +class SeeklyricsBackend(BaseModule, CapLyrics): NAME = 'seeklyrics' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/seloger/backend.py b/modules/seloger/backend.py index 22c2cf66fe5d0685efcd5fbf45996eff3502dfdb..d36e71915579cf2e6349196f493e2645ce77ea81 100644 --- a/modules/seloger/backend.py +++ b/modules/seloger/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.housing import CapHousing, City, Housing, HousingPhoto -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import SeLogerBrowser @@ -28,7 +28,7 @@ __all__ = ['SeLogerBackend'] -class SeLogerBackend(BaseBackend, CapHousing): +class SeLogerBackend(BaseModule, CapHousing): NAME = 'seloger' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/senscritique/backend.py b/modules/senscritique/backend.py index 75df6d7d0da36ade69f0748559002c79057e107a..afdc142c5da91749dc0e29b65c88814f302b8b6b 100644 --- a/modules/senscritique/backend.py +++ b/modules/senscritique/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['SenscritiqueBackend'] -class SenscritiqueBackend(BaseBackend, CapCalendarEvent): +class SenscritiqueBackend(BaseModule, CapCalendarEvent): NAME = 'senscritique' DESCRIPTION = u'senscritique website' MAINTAINER = u'Bezleputh' diff --git a/modules/sfr/backend.py b/modules/sfr/backend.py index 0eadbbc7d93babe40a762871f5bc4c0f16bca6ba..49a78e6356378376ded120971728da1f6ce34d9d 100644 --- a/modules/sfr/backend.py +++ b/modules/sfr/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import Value, ValueBackendPassword from .browser import SfrBrowser @@ -31,7 +31,7 @@ __all__ = ['SfrBackend'] -class SfrBackend(BaseBackend, CapAccount, CapMessages, CapMessagesPost): +class SfrBackend(BaseModule, CapAccount, CapMessages, CapMessagesPost): NAME = 'sfr' MAINTAINER = u'Christophe Benz' EMAIL = 'christophe.benz@gmail.com' diff --git a/modules/societegenerale/backend.py b/modules/societegenerale/backend.py index ad4133eda415caaf33e298cc9c0fcd957424bd95..8e2480acc19fe6b904fc71fa6c605b98826b69c9 100644 --- a/modules/societegenerale/backend.py +++ b/modules/societegenerale/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import CapBank, AccountNotFound -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import Value, ValueBackendPassword from .browser import SocieteGenerale @@ -30,7 +30,7 @@ __all__ = ['SocieteGeneraleBackend'] -class SocieteGeneraleBackend(BaseBackend, CapBank): +class SocieteGeneraleBackend(BaseModule, CapBank): NAME = 'societegenerale' MAINTAINER = u'Jocelyn Jaubert' EMAIL = 'jocelyn.jaubert@gmail.com' diff --git a/modules/somafm/backend.py b/modules/somafm/backend.py index 9bc45c3fd7da028ea3093b953fb846ac94501d64..4189290e0a736e6ef026e2e8eb522be5ffad143d 100644 --- a/modules/somafm/backend.py +++ b/modules/somafm/backend.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 BaseBackend +from weboob.tools.backend import BaseModule 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 SomaFMBackend(BaseBackend, CapRadio, CapCollection): +class SomaFMBackend(BaseModule, CapRadio, CapCollection): NAME = 'somafm' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/sueurdemetal/backend.py b/modules/sueurdemetal/backend.py index 6071904f8b3fdcb4bc19fdd832ea1c1f03853eb4..42b6671410fc22e6d34d637018a7c6b018eba7f1 100644 --- a/modules/sueurdemetal/backend.py +++ b/modules/sueurdemetal/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule 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 SueurDeMetalBackend(BaseBackend, CapCalendarEvent): +class SueurDeMetalBackend(BaseModule, CapCalendarEvent): NAME = 'sueurdemetal' DESCRIPTION = u'SueurDeMetal French concerts list website' MAINTAINER = u'Vincent A' diff --git a/modules/supertoinette/backend.py b/modules/supertoinette/backend.py index 899f350f4e19479d1ee36adf0c0ae5ebbe6caec5..82ea4ddf55aff0e4888ae53c55e9116ba5c32b2f 100644 --- a/modules/supertoinette/backend.py +++ b/modules/supertoinette/backend.py @@ -18,14 +18,14 @@ # along with weboob. If not, see . from weboob.capabilities.recipe import CapRecipe, Recipe -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import SupertoinetteBrowser __all__ = ['SupertoinetteBackend'] -class SupertoinetteBackend(BaseBackend, CapRecipe): +class SupertoinetteBackend(BaseModule, CapRecipe): NAME = 'supertoinette' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/tinder/backend.py b/modules/tinder/backend.py index 961207a4c93340ef9b8390ff78aee9fd9c32cd0b..e64f4df82cbd30c60fe27c0a713b8c4ebcb67368 100644 --- a/modules/tinder/backend.py +++ b/modules/tinder/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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 TinderBackend(BaseBackend, CapMessages, CapMessagesPost, CapDating): +class TinderBackend(BaseModule, CapMessages, CapMessagesPost, CapDating): NAME = 'tinder' DESCRIPTION = u'Tinder dating mobile application' MAINTAINER = u'Roger Philibert' diff --git a/modules/transilien/backend.py b/modules/transilien/backend.py index 20e76dc539adc17a7eecbe8fc76d3e61ee62b23c..a6319a963c1b4b24a83ac53178717dcb87de1c25 100644 --- a/modules/transilien/backend.py +++ b/modules/transilien/backend.py @@ -19,12 +19,12 @@ # along with weboob. If not, see . from weboob.capabilities.travel import CapTravel -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import Transilien -class TransilienBackend(BaseBackend, CapTravel): +class TransilienBackend(BaseModule, CapTravel): NAME = 'transilien' MAINTAINER = u'Julien Hébert' EMAIL = 'juke@free.fr' diff --git a/modules/trictractv/backend.py b/modules/trictractv/backend.py index 724c4b06e9d2375498e8e019853cb54812f80f9b..3e2c56f3df80ac7843553a895c8acfeae71c7556 100644 --- a/modules/trictractv/backend.py +++ b/modules/trictractv/backend.py @@ -22,7 +22,7 @@ from weboob.capabilities.video import CapVideo -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import TricTracTVBrowser from .video import TricTracTVVideo @@ -31,7 +31,7 @@ __all__ = ['TricTracTVBackend'] -class TricTracTVBackend(BaseBackend, CapVideo): +class TricTracTVBackend(BaseModule, CapVideo): NAME = 'trictractv' MAINTAINER = u'Benjamin Drieu' EMAIL = 'benjamin@drieu.org' diff --git a/modules/tvsubtitles/backend.py b/modules/tvsubtitles/backend.py index 39dc5a1c87cae196ce2b6fb784058a6354492bff..5a683e4ddf88aecf0189b0386ce71d336a2e421a 100644 --- a/modules/tvsubtitles/backend.py +++ b/modules/tvsubtitles/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import TvsubtitlesBrowser, LANGUAGE_LIST @@ -27,7 +27,7 @@ __all__ = ['TvsubtitlesBackend'] -class TvsubtitlesBackend(BaseBackend, CapSubtitle): +class TvsubtitlesBackend(BaseModule, CapSubtitle): NAME = 'tvsubtitles' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/twitter/backend.py b/modules/twitter/backend.py index 5d5262d403a81b698c5c69b9eb6b6feef50af38f..3dbb486a8403e46e324401f97673a75b2d448f98 100644 --- a/modules/twitter/backend.py +++ b/modules/twitter/backend.py @@ -19,7 +19,7 @@ from datetime import datetime, timedelta from weboob.tools.value import Value, ValueBackendPassword -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['TwitterBackend'] -class TwitterBackend(BaseBackend, CapMessages, CapMessagesPost, CapCollection): +class TwitterBackend(BaseModule, CapMessages, CapMessagesPost, CapCollection): NAME = 'twitter' DESCRIPTION = u'twitter website' MAINTAINER = u'Bezleputh' diff --git a/modules/unsee/backend.py b/modules/unsee/backend.py index 95016a9d61bac66e7c26b9089ed09746d71fa500..32122d96e3fb70743c81abb427db498e70058e2f 100644 --- a/modules/unsee/backend.py +++ b/modules/unsee/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.paste import BasePaste from weboob.tools.capabilities.paste import BasePasteBackend from weboob.tools.capabilities.paste import image_mime @@ -36,7 +36,7 @@ def id2url(cls, id): return 'https://unsee.cc/%s' % id -class UnseeBackend(BaseBackend, BasePasteBackend): +class UnseeBackend(BaseModule, BasePasteBackend): NAME = 'unsee' DESCRIPTION = u'unsee.cc expiring image hosting' MAINTAINER = u'Vincent A' diff --git a/modules/ups/backend.py b/modules/ups/backend.py index f834ed7a84852d481a31ea94bf7c4e8bbe9d484b..c43a36768e335394bb9478ba065e365171274bf4 100644 --- a/modules/ups/backend.py +++ b/modules/ups/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.parcel import CapParcel -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import UpsBrowser @@ -27,7 +27,7 @@ __all__ = ['UpsBackend'] -class UpsBackend(BaseBackend, CapParcel): +class UpsBackend(BaseModule, CapParcel): NAME = 'ups' DESCRIPTION = u'UPS website' MAINTAINER = u'Romain Bignon' diff --git a/modules/vimeo/backend.py b/modules/vimeo/backend.py index 1cef9230c433794df448bacf764736f914db9b7b..217ee88f08b5b1481cc2c083e71491107f97e4f4 100644 --- a/modules/vimeo/backend.py +++ b/modules/vimeo/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.collection import CapCollection, CollectionNotFound from .browser import VimeoBrowser @@ -30,7 +30,7 @@ __all__ = ['VimeoBackend'] -class VimeoBackend(BaseBackend, CapVideo, CapCollection): +class VimeoBackend(BaseModule, CapVideo, CapCollection): NAME = 'vimeo' MAINTAINER = u'François Revol' EMAIL = 'revol@free.fr' diff --git a/modules/vlille/backend.py b/modules/vlille/backend.py index 1ada9aea240004b7b4a26bb72b04c4ca96c75009..9391574b4320d31164c670c27ef089683e659758 100644 --- a/modules/vlille/backend.py +++ b/modules/vlille/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . import re -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.base import find_object from weboob.capabilities.gauge import CapGauge, GaugeSensor, Gauge, SensorNotFound @@ -27,7 +27,7 @@ __all__ = ['VlilleBackend'] -class VlilleBackend(BaseBackend, CapGauge): +class VlilleBackend(BaseModule, CapGauge): NAME = 'vlille' DESCRIPTION = u'access to vlille datas' MAINTAINER = u'Bezleputh' diff --git a/modules/voyagessncf/backend.py b/modules/voyagessncf/backend.py index 202c9579d2177587988dd4f180d5ee538d86ac36..1664d1a88f4bd537be434c94f1ffebd7f219b11f 100644 --- a/modules/voyagessncf/backend.py +++ b/modules/voyagessncf/backend.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, 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__ = ['VoyagesSNCFBackend'] -class VoyagesSNCFBackend(BaseBackend, CapTravel): +class VoyagesSNCFBackend(BaseModule, CapTravel): NAME = 'voyagessncf' DESCRIPTION = u'Voyages SNCF' MAINTAINER = u'Romain Bignon' diff --git a/modules/weather/backend.py b/modules/weather/backend.py index a7bfcf760855f07731f41e1a222bfd071c552a18..865183c92ac7c21fb34bda089605cf5cecde02ea 100644 --- a/modules/weather/backend.py +++ b/modules/weather/backend.py @@ -19,14 +19,14 @@ from weboob.capabilities.weather import CapWeather -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import WeatherBrowser __all__ = ['WeatherBackend'] -class WeatherBackend(BaseBackend, CapWeather): +class WeatherBackend(BaseModule, CapWeather): NAME = 'weather' MAINTAINER = u'Arno Renevier' EMAIL = 'arno@renevier.net' diff --git a/modules/wellsfargo/backend.py b/modules/wellsfargo/backend.py index 108593a3cbf341ff39bdddab4e4d9a101355538b..6338c316e78af82c8a162b06756dd451be4bff71 100644 --- a/modules/wellsfargo/backend.py +++ b/modules/wellsfargo/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import CapBank -from weboob.tools.backend import BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.value import ValueBackendPassword from .browser import WellsFargo @@ -28,7 +28,7 @@ __all__ = ['WellsFargoBackend'] -class WellsFargoBackend(BaseBackend, CapBank): +class WellsFargoBackend(BaseModule, CapBank): NAME = 'wellsfargo' MAINTAINER = u'Oleg Plakhotniuk' EMAIL = 'olegus8@gmail.com' diff --git a/modules/wordreference/backend.py b/modules/wordreference/backend.py index 16e0d681e5e7c26dc4f17679001273bb0b9f1dc8..96cf449777400fbc8b988e6353c9d16606ef212a 100644 --- a/modules/wordreference/backend.py +++ b/modules/wordreference/backend.py @@ -20,7 +20,7 @@ from weboob.capabilities.translate import CapTranslate, Translation, TranslationFail, LanguageNotSupported -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import WordReferenceBrowser @@ -28,7 +28,7 @@ __all__ = ['WordReferenceBackend'] -class WordReferenceBackend(BaseBackend, CapTranslate): +class WordReferenceBackend(BaseModule, CapTranslate): MAINTAINER = u'Lucien Loiseau' EMAIL = 'loiseau.lucien@gmail.com' VERSION = '1.0' diff --git a/modules/yahoo/backend.py b/modules/yahoo/backend.py index 702fef413e0b0420c59f4a18a39879ff19de0d1e..9e3051071e6e6fef32a0b52eeebb30234fe021ec 100644 --- a/modules/yahoo/backend.py +++ b/modules/yahoo/backend.py @@ -23,14 +23,14 @@ from weboob.capabilities.weather import CapWeather, CityNotFound, Current, Forecast, City -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.browser import StandardBrowser __all__ = ['YahooBackend'] -class YahooBackend(BaseBackend, CapWeather): +class YahooBackend(BaseModule, CapWeather): NAME = 'yahoo' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/youjizz/backend.py b/modules/youjizz/backend.py index 55041c9c12f335c0939504a50a5d040fec8e353e..7a338bce0060ab4f6c6052cf5d8819ad7448c344 100644 --- a/modules/youjizz/backend.py +++ b/modules/youjizz/backend.py @@ -22,7 +22,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo from weboob.capabilities.collection import CapCollection, CollectionNotFound -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import YoujizzBrowser @@ -30,7 +30,7 @@ __all__ = ['YoujizzBackend'] -class YoujizzBackend(BaseBackend, CapVideo, CapCollection): +class YoujizzBackend(BaseModule, CapVideo, CapCollection): NAME = 'youjizz' MAINTAINER = u'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/modules/youporn/backend.py b/modules/youporn/backend.py index 3e648db36438f915fc9af06fb0258bf2075c5dc2..eef458d8bc3cf0c4c1cfe5c1cfec08bd1d91ffc6 100644 --- a/modules/youporn/backend.py +++ b/modules/youporn/backend.py @@ -21,7 +21,7 @@ from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.capabilities.collection import CapCollection, CollectionNotFound from .browser import YoupornBrowser @@ -31,7 +31,7 @@ __all__ = ['YoupornBackend'] -class YoupornBackend(BaseBackend, CapVideo, CapCollection): +class YoupornBackend(BaseModule, CapVideo, CapCollection): NAME = 'youporn' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/youtube/backend.py b/modules/youtube/backend.py index 959db82ebb185eccd233ed1e79fd244ec3cbe221..f924e379dc62cf55c464e296b96ff81ad1374520 100644 --- a/modules/youtube/backend.py +++ b/modules/youtube/backend.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 BaseBackend, BackendConfig +from weboob.tools.backend import BaseModule, BackendConfig from weboob.tools.misc import to_unicode from weboob.tools.value import ValueBackendPassword, Value @@ -44,7 +44,7 @@ __all__ = ['YoutubeBackend'] -class YoutubeBackend(BaseBackend, CapVideo, CapCollection): +class YoutubeBackend(BaseModule, CapVideo, CapCollection): NAME = 'youtube' MAINTAINER = u'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' diff --git a/tools/boilerplate_data/base_backend.py b/tools/boilerplate_data/base_backend.py index fcbf1ec88c212cfa1f7b2cc322aa46a365a059ea..419f358895d8422f4e9fca42601dec032553ec56 100644 --- a/tools/boilerplate_data/base_backend.py +++ b/tools/boilerplate_data/base_backend.py @@ -1,5 +1,5 @@ <%inherit file="layout.py"/> -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from .browser import ${r.classname}Browser @@ -7,7 +7,7 @@ __all__ = ['${r.classname}Backend'] -class ${r.classname}Backend(BaseBackend): +class ${r.classname}Backend(BaseModule): 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 a7703bfd8cd0bca5e3170223c3cde3f37313273e..9ee78af81327450c312db2c6116c10240e51112d 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 BaseBackend +from weboob.tools.backend import BaseModule from ${r.capmodulename} import ${r.capname} from .browser import ${r.classname}Browser @@ -8,7 +8,7 @@ __all__ = ['${r.classname}Backend'] -class ${r.classname}Backend(BaseBackend, ${r.capname}): +class ${r.classname}Backend(BaseModule, ${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 9be8fd0892c68227eb68027e5b78b5790596d6c1..db6ce7d58e87bc18a184dd7876d293437e1a3520 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.BaseBackend.fillobj` on a object based on :class:`BaseObject`, + When you use :func:`weboob.tools.backend.BaseModule.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 153f616a1881de186b2d7bb9c0ec467a69afdd4e..8b56a07b30e3c81271897d5e9b78d2b5d7753986 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:`BaseBackend`] + :type backends: list[:class:`BaseModule`] :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 de14959125547abe68a372172437e31b4117f652..c297c4916012ef4a8583444bfea62b0c44a26ca5 100644 --- a/weboob/core/modules.py +++ b/weboob/core/modules.py @@ -21,7 +21,7 @@ import imp import logging -from weboob.tools.backend import BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.log import getLogger @@ -41,10 +41,10 @@ def __init__(self, package): self.klass = None for attrname in dir(self.package): attr = getattr(self.package, attrname) - if isinstance(attr, type) and issubclass(attr, BaseBackend) and attr != BaseBackend: + if isinstance(attr, type) and issubclass(attr, BaseModule) and attr != BaseModule: self.klass = attr if not self.klass: - raise ImportError('%s is not a backend (no BaseBackend class found)' % package) + raise ImportError('%s is not a backend (no BaseModule class found)' % package) @property def name(self): diff --git a/weboob/core/ouiboube.py b/weboob/core/ouiboube.py index 760bb1e237ec5e5ceaa7f466c588e7e81da04226..46e8d64ab085a2a89659272c4589b3a9f63cab32 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 BaseBackend +from weboob.tools.backend import BaseModule 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.BaseBackend` + :rtype: :class:`weboob.tools.backend.BaseModule` """ 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.BaseBackend` + :rtype: :class:`weboob.tools.backend.BaseModule` """ 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.BaseBackend`] + :rtype: iter[:class:`weboob.tools.backend.BaseModule`] """ 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, BaseBackend): + if isinstance(_backends, BaseModule): 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.BaseBackend` + :rtype: :class:`weboob.tools.backend.BaseModule` """ 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.BaseBackend`] + :rtype: dict[:class:`str`, :class:`weboob.tools.backend.BaseModule`] """ 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 BaseBackend.ConfigError as e: + except BaseModule.ConfigError as e: if errors is not None: errors.append(self.LoadError(instance_name, e)) else: diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py index 942d2735baf046487457abee391ff00e40f5d8a8..c36139880ba9f424b96db105a98448c43e55c881 100644 --- a/weboob/tools/backend.py +++ b/weboob/tools/backend.py @@ -29,7 +29,7 @@ from weboob.tools.value import ValuesDict -__all__ = ['BackendStorage', 'BackendConfig', 'BaseBackend'] +__all__ = ['BackendStorage', 'BackendConfig', 'BaseModule'] 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:`BaseBackend`, in the - :attr:`BaseBackend.storage` attribute. + It is instancied automatically in constructor of :class:`BaseModule`, in the + :attr:`BaseModule.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 BaseBackend.ConfigError('Backend(%s): Configuration error: Missing parameter "%s" (%s)' + raise BaseModule.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 BaseBackend.ConfigError( + raise BaseModule.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 BaseBackend(object): +class BaseModule(object): """ Base class for backends. diff --git a/weboob/tools/capabilities/gallery/genericcomicreader.py b/weboob/tools/capabilities/gallery/genericcomicreader.py index 50599e3d5bc51140ef3c3f06b4f54e39cf157656..e65cc593e07d24af7ff5ab1d1e8beaf80a2823b5 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 BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.browser import BaseBrowser, BasePage __all__ = ['GenericComicReaderBackend'] @@ -63,7 +63,7 @@ def fill_image(self, image, fields): image.data = self.readurl(image.url) -class GenericComicReaderBackend(BaseBackend, CapGallery): +class GenericComicReaderBackend(BaseModule, CapGallery): NAME = 'genericcomicreader' MAINTAINER = u'Noé Rubinstein' EMAIL = 'noe.rubinstein@gmail.com' diff --git a/weboob/tools/capabilities/messages/GenericBackend.py b/weboob/tools/capabilities/messages/GenericBackend.py index 1130c64d7b252dc4bb47bf6a958c5c0ba7644042..eeb1cd3888683854eade4166a0ed37aa3395e58b 100644 --- a/weboob/tools/capabilities/messages/GenericBackend.py +++ b/weboob/tools/capabilities/messages/GenericBackend.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 BaseBackend +from weboob.tools.backend import BaseModule from weboob.tools.newsfeed import Newsfeed -class GenericNewspaperBackend(BaseBackend, CapMessages): +class GenericNewspaperBackend(BaseModule, CapMessages): """ GenericNewspaperBackend class """