Rename BaseModule to Module and Module to LoadedModule

modules/750g/module.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 from weboob.capabilities.recipe import CapRecipe, Recipe
-from weboob.tools.backend import BaseModule
+from weboob.tools.backend import Module
 
 from .browser import SevenFiftyGramsBrowser
 
@@ -30,7 +30,7 @@ def strip_accents(s):
 __all__ = ['SevenFiftyGramsModule']
 
 
-class SevenFiftyGramsModule(BaseModule, CapRecipe):
+class SevenFiftyGramsModule(Module, CapRecipe):
     NAME = '750g'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

modules/adecco/module.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.ordereddict import OrderedDict
 from weboob.tools.value import Value
 from weboob.capabilities.job import CapJob
@@ -28,7 +28,7 @@ from .job import AdeccoJobAdvert
 __all__ = ['AdeccoModule']
 
 
-class AdeccoModule(BaseModule, CapJob):
+class AdeccoModule(Module, CapJob):
     NAME = 'adecco'
     DESCRIPTION = u'adecco website'
     MAINTAINER = u'Bezleputh'

modules/agendadulibre/module.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES
 from weboob.tools.ordereddict import OrderedDict
 from weboob.tools.value import Value
@@ -29,7 +29,7 @@ from .browser import AgendadulibreBrowser
 __all__ = ['AgendadulibreModule']
 
 
-class AgendadulibreModule(BaseModule, CapCalendarEvent):
+class AgendadulibreModule(Module, CapCalendarEvent):
     NAME = 'agendadulibre'
     DESCRIPTION = u'agendadulibre website'
     MAINTAINER = u'Bezleputh'

modules/allocine/module.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 from weboob.capabilities.cinema import CapCinema, Person, Movie
-from weboob.tools.backend import BaseModule
+from weboob.tools.backend import Module
 
 from .browser import AllocineBrowser
 
@@ -27,7 +27,7 @@ from urllib import quote_plus
 __all__ = ['AllocineModule']
 
 
-class AllocineModule(BaseModule, CapCinema):
+class AllocineModule(Module, CapCinema):
     NAME = 'allocine'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

modules/alloresto/module.py

@@ -20,7 +20,7 @@
 
 
 from weboob.capabilities.bank import CapBank, AccountNotFound
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 
 from .browser import AlloRestoBrowser
@@ -29,7 +29,7 @@ from .browser import AlloRestoBrowser
 __all__ = ['AlloRestoModule']
 
 
-class AlloRestoModule(BaseModule, CapBank):
+class AlloRestoModule(Module, CapBank):
     NAME = 'alloresto'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/allrecipes/module.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 from weboob.capabilities.recipe import CapRecipe, Recipe
-from weboob.tools.backend import BaseModule
+from weboob.tools.backend import Module
 
 from .browser import AllrecipesBrowser
 
@@ -27,7 +27,7 @@ from urllib import quote_plus
 __all__ = ['AllrecipesModule']
 
 
-class AllrecipesModule(BaseModule, CapRecipe):
+class AllrecipesModule(Module, CapRecipe):
     NAME = 'allrecipes'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

modules/ameli/module.py

@@ -19,14 +19,14 @@
 
 import urllib
 from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 from .browser import AmeliBrowser
 
 __all__ = ['AmeliModule']
 
 
-class AmeliModule(BaseModule, CapBill):
+class AmeliModule(Module, CapBill):
     NAME = 'ameli'
     DESCRIPTION = u'Ameli website: French Health Insurance'
     MAINTAINER = u'Christophe Lampin'

modules/amelipro/module.py

@@ -19,14 +19,14 @@
 
 import urllib
 from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 from .browser import AmeliProBrowser
 
 __all__ = ['AmeliProModule']
 
 
-class AmeliProModule(BaseModule, CapBill):
+class AmeliProModule(Module, CapBill):
     NAME = 'amelipro'
     DESCRIPTION = u'Ameli website: French Health Insurance for Professionals'
     MAINTAINER = u'Christophe Lampin'

modules/americanexpress/module.py

@@ -20,7 +20,7 @@
 
 
 from weboob.capabilities.bank import CapBank, AccountNotFound
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 
 from .browser import AmericanExpressBrowser
@@ -29,7 +29,7 @@ from .browser import AmericanExpressBrowser
 __all__ = ['AmericanExpressModule']
 
 
-class AmericanExpressModule(BaseModule, CapBank):
+class AmericanExpressModule(Module, CapBank):
     NAME = 'americanexpress'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/apec/module.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.capabilities.job import CapJob
 from weboob.tools.ordereddict import OrderedDict
 from weboob.tools.value import Value
@@ -28,7 +28,7 @@ from .job import ApecJobAdvert
 __all__ = ['ApecModule']
 
 
-class ApecModule(BaseModule, CapJob):
+class ApecModule(Module, CapJob):
     NAME = 'apec'
     DESCRIPTION = u'apec website'
     MAINTAINER = u'Bezleputh'

modules/apivie/module.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 from weboob.capabilities.bank import CapBank
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 
 from .browser import ApivieBrowser
@@ -27,7 +27,7 @@ from .browser import ApivieBrowser
 __all__ = ['ApivieModule']
 
 
-class ApivieModule(BaseModule, CapBank):
+class ApivieModule(Module, CapBank):
     NAME = 'apivie'
     DESCRIPTION = u'Apivie'
     MAINTAINER = u'Romain Bignon'

modules/arretsurimages/module.py

@@ -20,7 +20,7 @@
 
 from weboob.capabilities.video import CapVideo, BaseVideo
 from weboob.capabilities.collection import CapCollection, CollectionNotFound
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 
 from .browser import ArretSurImagesBrowser
@@ -29,7 +29,7 @@ from .video import ArretSurImagesVideo
 __all__ = ['ArretSurImagesModule']
 
 
-class ArretSurImagesModule(BaseModule, CapVideo, CapCollection):
+class ArretSurImagesModule(Module, CapVideo, CapCollection):
     NAME = 'arretsurimages'
     DESCRIPTION = u'arretsurimages website'
     MAINTAINER = u'franek'

modules/arte/module.py

@@ -22,7 +22,7 @@ import re
 
 from weboob.capabilities.video import CapVideo, BaseVideo
 from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import Value
 
 from .browser import ArteBrowser
@@ -32,7 +32,7 @@ from .video import ArteVideo, ArteLiveVideo
 __all__ = ['ArteModule']
 
 
-class ArteModule(BaseModule, CapVideo, CapCollection):
+class ArteModule(Module, CapVideo, CapCollection):
     NAME = 'arte'
     MAINTAINER = u'Bezleputh'
     EMAIL = 'carton_ben@yahoo.fr'

modules/attilasub/module.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported
-from weboob.tools.backend import BaseModule
+from weboob.tools.backend import Module
 
 from .browser import AttilasubBrowser
 
@@ -27,7 +27,7 @@ from urllib import quote_plus
 __all__ = ['AttilasubModule']
 
 
-class AttilasubModule(BaseModule, CapSubtitle):
+class AttilasubModule(Module, CapSubtitle):
     NAME = 'attilasub'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

modules/audioaddict/module.py

@@ -22,7 +22,7 @@ from weboob.capabilities.radio import CapRadio, Radio
 from weboob.capabilities.audiostream import BaseAudioStream
 from weboob.tools.capabilities.streaminfo import StreamInfo
 from weboob.capabilities.collection import CapCollection, Collection
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import Value
 from weboob.tools.browser import StandardBrowser
 import time
@@ -38,7 +38,7 @@ __all__ = ['AudioAddictModule']
 # option to another player in the ~/.config/weboob/radioob config file:
 # [ROOT]
 # media_player = your_non_mplayer_player
-class AudioAddictModule(BaseModule, CapRadio, CapCollection):
+class AudioAddictModule(Module, CapRadio, CapCollection):
     NAME = 'audioaddict'
     MAINTAINER = u'Pierre Mazière'
     EMAIL = 'pierre.maziere@gmx.com'

modules/aum/module.py

@@ -33,7 +33,7 @@ from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message,
 from weboob.capabilities.dating import CapDating, OptimizationNotFound, Event
 from weboob.capabilities.contact import CapContact, ContactPhoto, Query, QueryError
 from weboob.capabilities.account import CapAccount, StatusField
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.browser import BrowserUnavailable, BrowserHTTPNotFound
 from weboob.tools.value import Value, ValuesDict, ValueBool, ValueBackendPassword
 from weboob.tools.log import getLogger
@@ -57,7 +57,7 @@ def parse_dt(s):
     return local2utc(d)
 
 
-class AuMModule(BaseModule, CapMessages, CapMessagesPost, CapDating, CapChat, CapContact, CapAccount):
+class AuMModule(Module, CapMessages, CapMessagesPost, CapDating, CapChat, CapContact, CapAccount):
     NAME = 'aum'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'
@@ -79,7 +79,7 @@ class AuMModule(BaseModule, CapMessages, CapMessagesPost, CapDating, CapChat, Ca
     MAGIC_ID_BASKET = 1
 
     def __init__(self, *args, **kwargs):
-        BaseModule.__init__(self, *args, **kwargs)
+        Module.__init__(self, *args, **kwargs)
         if self.config['antispam'].get():
             self.antispam = AntiSpam()
         else:

modules/axabanque/module.py

@@ -19,7 +19,7 @@
 
 
 from weboob.capabilities.bank import CapBank, AccountNotFound
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 
 from .browser import AXABanque
@@ -28,7 +28,7 @@ from .browser import AXABanque
 __all__ = ['AXABanqueModule']
 
 
-class AXABanqueModule(BaseModule, CapBank):
+class AXABanqueModule(Module, CapBank):
     NAME = 'axabanque'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/banqueaccord/module.py

@@ -20,7 +20,7 @@
 
 from weboob.capabilities.base import find_object
 from weboob.capabilities.bank import CapBank, AccountNotFound
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 
 from .browser import BanqueAccordBrowser
@@ -29,7 +29,7 @@ from .browser import BanqueAccordBrowser
 __all__ = ['BanqueAccordModule']
 
 
-class BanqueAccordModule(BaseModule, CapBank):
+class BanqueAccordModule(Module, CapBank):
     NAME = 'banqueaccord'
     DESCRIPTION = u'Banque Accord'
     MAINTAINER = u'Romain Bignon'

modules/banquepopulaire/module.py

@@ -19,7 +19,7 @@
 
 
 from weboob.capabilities.bank import CapBank, AccountNotFound
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.ordereddict import OrderedDict
 from weboob.tools.value import ValueBackendPassword, Value
 
@@ -29,7 +29,7 @@ from .browser import BanquePopulaire
 __all__ = ['BanquePopulaireModule']
 
 
-class BanquePopulaireModule(BaseModule, CapBank):
+class BanquePopulaireModule(Module, CapBank):
     NAME = 'banquepopulaire'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/barclays/module.py

@@ -19,7 +19,7 @@
 
 
 from weboob.capabilities.bank import CapBank, AccountNotFound
-from weboob.tools.backend import BaseModule, BackendConfig
+from weboob.tools.backend import Module, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 
 from .browser import Barclays
@@ -28,7 +28,7 @@ from .browser import Barclays
 __all__ = ['BarclaysModule']
 
 
-class BarclaysModule(BaseModule, CapBank):
+class BarclaysModule(Module, CapBank):
     NAME = 'barclays'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'