diff --git a/modules/750g/__init__.py b/modules/750g/__init__.py
index da6bec56189dc4a3c7004bde5dbdb5f3b5daff27..4dbcb21eea0b1175c58b9351a4af51fcd1b3a759 100644
--- a/modules/750g/__init__.py
+++ b/modules/750g/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import SevenFiftyGramsBackend
+from .backend import SevenFiftyGramsModule
-__all__ = ['SevenFiftyGramsBackend']
+__all__ = ['SevenFiftyGramsModule']
diff --git a/modules/750g/backend.py b/modules/750g/backend.py
index 5488b3e3ef4f522663d93c8245188b4c0ee7f815..6a6d045db2ce2df4d64fb2c1ccca4d06c97448fb 100644
--- a/modules/750g/backend.py
+++ b/modules/750g/backend.py
@@ -27,10 +27,10 @@
def strip_accents(s):
return ''.join(c for c in unicodedata.normalize('NFD', s) if unicodedata.category(c) != 'Mn')
-__all__ = ['SevenFiftyGramsBackend']
+__all__ = ['SevenFiftyGramsModule']
-class SevenFiftyGramsBackend(BaseModule, CapRecipe):
+class SevenFiftyGramsModule(BaseModule, CapRecipe):
NAME = '750g'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/adecco/__init__.py b/modules/adecco/__init__.py
index 70326c84d54faff4828ef0b87e49c047610fef07..255d410d39c013917aa7da155d6e606f8ed5c090 100644
--- a/modules/adecco/__init__.py
+++ b/modules/adecco/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import AdeccoBackend
+from .backend import AdeccoModule
-__all__ = ['AdeccoBackend']
+__all__ = ['AdeccoModule']
diff --git a/modules/adecco/backend.py b/modules/adecco/backend.py
index 893441c716d957da554da1a1a4b60cbebe477b97..2687ed74625f3e2f688e3408efdd8144a3c439a0 100644
--- a/modules/adecco/backend.py
+++ b/modules/adecco/backend.py
@@ -25,10 +25,10 @@
from .browser import AdeccoBrowser
from .job import AdeccoJobAdvert
-__all__ = ['AdeccoBackend']
+__all__ = ['AdeccoModule']
-class AdeccoBackend(BaseModule, CapJob):
+class AdeccoModule(BaseModule, CapJob):
NAME = 'adecco'
DESCRIPTION = u'adecco website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/agendadulibre/__init__.py b/modules/agendadulibre/__init__.py
index 354c3fbec682215ff0f32212c83c7688bf3b0671..1a4f52e37fd1b8b2341805469ecdc707faf7e283 100644
--- a/modules/agendadulibre/__init__.py
+++ b/modules/agendadulibre/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import AgendadulibreBackend
+from .backend import AgendadulibreModule
-__all__ = ['AgendadulibreBackend']
+__all__ = ['AgendadulibreModule']
diff --git a/modules/agendadulibre/backend.py b/modules/agendadulibre/backend.py
index b5b65152a4d512179d7b909974189d3c6e9205a4..f68f71aebffcd4bf4e68c8d763e92bb6aff9edff 100644
--- a/modules/agendadulibre/backend.py
+++ b/modules/agendadulibre/backend.py
@@ -26,10 +26,10 @@
from .browser import AgendadulibreBrowser
-__all__ = ['AgendadulibreBackend']
+__all__ = ['AgendadulibreModule']
-class AgendadulibreBackend(BaseModule, CapCalendarEvent):
+class AgendadulibreModule(BaseModule, CapCalendarEvent):
NAME = 'agendadulibre'
DESCRIPTION = u'agendadulibre website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/allocine/__init__.py b/modules/allocine/__init__.py
index 3ba9bc775d1f12069c3b17c18ab1c4725b78885b..d79af502cf0ddfe3aefa29dddbad9d50646b4e71 100644
--- a/modules/allocine/__init__.py
+++ b/modules/allocine/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import AllocineBackend
+from .backend import AllocineModule
-__all__ = ['AllocineBackend']
+__all__ = ['AllocineModule']
diff --git a/modules/allocine/backend.py b/modules/allocine/backend.py
index 911c21e09ee09507e2b91d7b89cb12e17eb54c5c..b816607252d7c7bccf91b787074a267765d89c30 100644
--- a/modules/allocine/backend.py
+++ b/modules/allocine/backend.py
@@ -24,10 +24,10 @@
from urllib import quote_plus
-__all__ = ['AllocineBackend']
+__all__ = ['AllocineModule']
-class AllocineBackend(BaseModule, CapCinema):
+class AllocineModule(BaseModule, CapCinema):
NAME = 'allocine'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/alloresto/__init__.py b/modules/alloresto/__init__.py
index 93d8a07fe0ab8a00481248a2d55805b91d28f1e3..2346783b58afc980ace5d9a58396ec49dbe2c194 100644
--- a/modules/alloresto/__init__.py
+++ b/modules/alloresto/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import AlloRestoBackend
+from .backend import AlloRestoModule
-__all__ = ['AlloRestoBackend']
+__all__ = ['AlloRestoModule']
diff --git a/modules/alloresto/backend.py b/modules/alloresto/backend.py
index 4a3de6cc4d6c112ffabc058457260a6f002bfe1b..90583bc37c5aa918977063887e81d31eb0cd7887 100644
--- a/modules/alloresto/backend.py
+++ b/modules/alloresto/backend.py
@@ -26,10 +26,10 @@
from .browser import AlloRestoBrowser
-__all__ = ['AlloRestoBackend']
+__all__ = ['AlloRestoModule']
-class AlloRestoBackend(BaseModule, CapBank):
+class AlloRestoModule(BaseModule, CapBank):
NAME = 'alloresto'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/allrecipes/__init__.py b/modules/allrecipes/__init__.py
index c66314c304928bb02eb0007599f467e77c1108d4..8bb0d1388b1ac79f480867b6e0abbda09bb691b2 100644
--- a/modules/allrecipes/__init__.py
+++ b/modules/allrecipes/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import AllrecipesBackend
+from .backend import AllrecipesModule
-__all__ = ['AllrecipesBackend']
+__all__ = ['AllrecipesModule']
diff --git a/modules/allrecipes/backend.py b/modules/allrecipes/backend.py
index a979fe360f5ac784ff6b4707341d51996e6363d7..d94317bafd3ecc67fcf2d7908b810de32f7caeb2 100644
--- a/modules/allrecipes/backend.py
+++ b/modules/allrecipes/backend.py
@@ -24,10 +24,10 @@
from urllib import quote_plus
-__all__ = ['AllrecipesBackend']
+__all__ = ['AllrecipesModule']
-class AllrecipesBackend(BaseModule, CapRecipe):
+class AllrecipesModule(BaseModule, CapRecipe):
NAME = 'allrecipes'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/ameli/__init__.py b/modules/ameli/__init__.py
index 2d8d3b89daa83a17fa71a951f6e2b8a4b3a0e1d2..1600269444df0d5745d12f5fda368a2520523c76 100644
--- a/modules/ameli/__init__.py
+++ b/modules/ameli/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import AmeliBackend
+from .backend import AmeliModule
-__all__ = ['AmeliBackend']
+__all__ = ['AmeliModule']
diff --git a/modules/ameli/backend.py b/modules/ameli/backend.py
index d02f529dbb03a353c917118575d7037d8f05d76d..fcb7ca8fd0ac13beeb0c6cca0991ebcae2584356 100644
--- a/modules/ameli/backend.py
+++ b/modules/ameli/backend.py
@@ -23,10 +23,10 @@
from weboob.tools.value import ValueBackendPassword
from .browser import AmeliBrowser
-__all__ = ['AmeliBackend']
+__all__ = ['AmeliModule']
-class AmeliBackend(BaseModule, CapBill):
+class AmeliModule(BaseModule, CapBill):
NAME = 'ameli'
DESCRIPTION = u'Ameli website: French Health Insurance'
MAINTAINER = u'Christophe Lampin'
diff --git a/modules/amelipro/__init__.py b/modules/amelipro/__init__.py
index 48b13b9293c16f8726705e328f7980ff0a515c0e..a08219153bf0479513f8bc549e534834a11aa73e 100644
--- a/modules/amelipro/__init__.py
+++ b/modules/amelipro/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import AmeliProBackend
+from .backend import AmeliProModule
-__all__ = ['AmeliProBackend']
+__all__ = ['AmeliProModule']
diff --git a/modules/amelipro/backend.py b/modules/amelipro/backend.py
index e607c82e0fd84184e5ec6fcae3ac1cec65ba35eb..2b0d5d033cf0b8308d4ba4137374cd7880cff907 100644
--- a/modules/amelipro/backend.py
+++ b/modules/amelipro/backend.py
@@ -23,10 +23,10 @@
from weboob.tools.value import ValueBackendPassword
from .browser import AmeliProBrowser
-__all__ = ['AmeliProBackend']
+__all__ = ['AmeliProModule']
-class AmeliProBackend(BaseModule, CapBill):
+class AmeliProModule(BaseModule, CapBill):
NAME = 'amelipro'
DESCRIPTION = u'Ameli website: French Health Insurance for Professionals'
MAINTAINER = u'Christophe Lampin'
diff --git a/modules/americanexpress/__init__.py b/modules/americanexpress/__init__.py
index 7302887f153e0b97ab852dfe67e2a91dd318a5b4..e797c144582b8b1bda1742e848985f71a1da382c 100644
--- a/modules/americanexpress/__init__.py
+++ b/modules/americanexpress/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import AmericanExpressBackend
+from .backend import AmericanExpressModule
-__all__ = ['AmericanExpressBackend']
+__all__ = ['AmericanExpressModule']
diff --git a/modules/americanexpress/backend.py b/modules/americanexpress/backend.py
index f85bc696e3d676191437ce483aaa0656dea694b8..9ea18e8a532ac7798cb7b2144dcda9e7e1b8696f 100644
--- a/modules/americanexpress/backend.py
+++ b/modules/americanexpress/backend.py
@@ -26,10 +26,10 @@
from .browser import AmericanExpressBrowser
-__all__ = ['AmericanExpressBackend']
+__all__ = ['AmericanExpressModule']
-class AmericanExpressBackend(BaseModule, CapBank):
+class AmericanExpressModule(BaseModule, CapBank):
NAME = 'americanexpress'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/apec/__init__.py b/modules/apec/__init__.py
index cce56b15405b99a74e4dc61fce9b6ce421a1e7ee..2da82ea0b5b6022fd571cc3d994e130ee7ee5950 100644
--- a/modules/apec/__init__.py
+++ b/modules/apec/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import ApecBackend
+from .backend import ApecModule
-__all__ = ['ApecBackend']
+__all__ = ['ApecModule']
diff --git a/modules/apec/backend.py b/modules/apec/backend.py
index b3610afa84ccc9c01fc0e3a64d4c86ea97c9d8c8..e8cb6540bad6ea5c666a91a18fb7bd2abf1c87bc 100644
--- a/modules/apec/backend.py
+++ b/modules/apec/backend.py
@@ -25,10 +25,10 @@
from .browser import ApecBrowser
from .job import ApecJobAdvert
-__all__ = ['ApecBackend']
+__all__ = ['ApecModule']
-class ApecBackend(BaseModule, CapJob):
+class ApecModule(BaseModule, CapJob):
NAME = 'apec'
DESCRIPTION = u'apec website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/apivie/__init__.py b/modules/apivie/__init__.py
index 46566a7ddadcc8c1424a0ba5599d24855209ae89..49734e8ac554715194ea09db8f39f1278eb711df 100644
--- a/modules/apivie/__init__.py
+++ b/modules/apivie/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import ApivieBackend
+from .backend import ApivieModule
-__all__ = ['ApivieBackend']
+__all__ = ['ApivieModule']
diff --git a/modules/apivie/backend.py b/modules/apivie/backend.py
index ef298771d1069a61fd701fd5843301422d5b17be..76a6d4015ae26f11156ecb3ca9523b8cbf4f0093 100644
--- a/modules/apivie/backend.py
+++ b/modules/apivie/backend.py
@@ -24,10 +24,10 @@
from .browser import ApivieBrowser
-__all__ = ['ApivieBackend']
+__all__ = ['ApivieModule']
-class ApivieBackend(BaseModule, CapBank):
+class ApivieModule(BaseModule, CapBank):
NAME = 'apivie'
DESCRIPTION = u'Apivie'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/arretsurimages/__init__.py b/modules/arretsurimages/__init__.py
index dc0aead785ce00f0a687e4ee191bd28cb41f583b..a39720deb17ab055dcb639f0b7e15a5fd0e699b0 100644
--- a/modules/arretsurimages/__init__.py
+++ b/modules/arretsurimages/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import ArretSurImagesBackend
+from .backend import ArretSurImagesModule
-__all__ = ['ArretSurImagesBackend']
+__all__ = ['ArretSurImagesModule']
diff --git a/modules/arretsurimages/backend.py b/modules/arretsurimages/backend.py
index 7bc49373f2170c1bfc708bbc0675b5d0c783c3b3..c7490a375ba977e46af41ba9fdfd92457042bfa6 100644
--- a/modules/arretsurimages/backend.py
+++ b/modules/arretsurimages/backend.py
@@ -26,10 +26,10 @@
from .browser import ArretSurImagesBrowser
from .video import ArretSurImagesVideo
-__all__ = ['ArretSurImagesBackend']
+__all__ = ['ArretSurImagesModule']
-class ArretSurImagesBackend(BaseModule, CapVideo, CapCollection):
+class ArretSurImagesModule(BaseModule, CapVideo, CapCollection):
NAME = 'arretsurimages'
DESCRIPTION = u'arretsurimages website'
MAINTAINER = u'franek'
diff --git a/modules/arte/__init__.py b/modules/arte/__init__.py
index 720e6ba8e2acf30961da558ce0557b454c76140c..aa409c389501f258dabe2efc70dca0574f51856e 100644
--- a/modules/arte/__init__.py
+++ b/modules/arte/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import ArteBackend
+from .backend import ArteModule
-__all__ = ['ArteBackend']
+__all__ = ['ArteModule']
diff --git a/modules/arte/backend.py b/modules/arte/backend.py
index 3ac365a15b36ba9fe667ce81e761e662f502cec7..75cc094b6171975f2c62f34c162b1bb22f6a2cbb 100644
--- a/modules/arte/backend.py
+++ b/modules/arte/backend.py
@@ -29,10 +29,10 @@
from .video import ArteVideo, ArteLiveVideo
-__all__ = ['ArteBackend']
+__all__ = ['ArteModule']
-class ArteBackend(BaseModule, CapVideo, CapCollection):
+class ArteModule(BaseModule, CapVideo, CapCollection):
NAME = 'arte'
MAINTAINER = u'Bezleputh'
EMAIL = 'carton_ben@yahoo.fr'
diff --git a/modules/attilasub/__init__.py b/modules/attilasub/__init__.py
index 4bb4eb3560ac3e70e10c0a1de7b1337d08a6ca18..c0752ef5d8fa7f920cc3a658edc5e4f2b53e4652 100644
--- a/modules/attilasub/__init__.py
+++ b/modules/attilasub/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import AttilasubBackend
+from .backend import AttilasubModule
-__all__ = ['AttilasubBackend']
+__all__ = ['AttilasubModule']
diff --git a/modules/attilasub/backend.py b/modules/attilasub/backend.py
index a6276ec6b24a5225470b2de9db12d8a7f2506f7f..76b8ed583fa935e5801623269a5c227c3a16b3e4 100644
--- a/modules/attilasub/backend.py
+++ b/modules/attilasub/backend.py
@@ -24,10 +24,10 @@
from urllib import quote_plus
-__all__ = ['AttilasubBackend']
+__all__ = ['AttilasubModule']
-class AttilasubBackend(BaseModule, CapSubtitle):
+class AttilasubModule(BaseModule, CapSubtitle):
NAME = 'attilasub'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/audioaddict/__init__.py b/modules/audioaddict/__init__.py
index 85ce2adf4bfca889969e2a5eb61434a890abf38e..02cc9614d8043d50987508e5942684a8c70b5f74 100644
--- a/modules/audioaddict/__init__.py
+++ b/modules/audioaddict/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import AudioAddictBackend
+from .backend import AudioAddictModule
-__all__ = ['AudioAddictBackend']
+__all__ = ['AudioAddictModule']
diff --git a/modules/audioaddict/backend.py b/modules/audioaddict/backend.py
index 29e46deade74815ddc75bfa6ee234db961dd93e4..bdf133304ba4ade7973ccf7d555259b5807cb0bc 100644
--- a/modules/audioaddict/backend.py
+++ b/modules/audioaddict/backend.py
@@ -27,7 +27,7 @@
from weboob.tools.browser import StandardBrowser
import time
-__all__ = ['AudioAddictBackend']
+__all__ = ['AudioAddictModule']
#
@@ -38,7 +38,7 @@
# option to another player in the ~/.config/weboob/radioob config file:
# [ROOT]
# media_player = your_non_mplayer_player
-class AudioAddictBackend(BaseModule, CapRadio, CapCollection):
+class AudioAddictModule(BaseModule, CapRadio, CapCollection):
NAME = 'audioaddict'
MAINTAINER = u'Pierre Mazière'
EMAIL = 'pierre.maziere@gmx.com'
@@ -124,7 +124,7 @@ class AudioAddictBackend(BaseModule, CapRadio, CapCollection):
)
def __init__(self, *a, **kw):
- super(AudioAddictBackend, self).__init__(*a, **kw)
+ super(AudioAddictModule, self).__init__(*a, **kw)
self.RADIOS = {}
self.HISTORY = {}
diff --git a/modules/aum/__init__.py b/modules/aum/__init__.py
index 71df517039fce3801808c03bfeb717e46ba0153c..cea44018919fbcc49904a85e3f848e0211c9f177 100644
--- a/modules/aum/__init__.py
+++ b/modules/aum/__init__.py
@@ -19,6 +19,6 @@
from .browser import AuMBrowser
-from .backend import AuMBackend
+from .backend import AuMModule
-__all__ = ['AuMBrowser', 'AuMBackend']
+__all__ = ['AuMBrowser', 'AuMModule']
diff --git a/modules/aum/backend.py b/modules/aum/backend.py
index 7a59740af819a54838d9f85f8b57df32bdbf5c4b..3857fbaf2130b89bb29698adb98a9500a754995d 100644
--- a/modules/aum/backend.py
+++ b/modules/aum/backend.py
@@ -49,7 +49,7 @@
from .optim.queries_queue import QueriesQueue
-__all__ = ['AuMBackend']
+__all__ = ['AuMModule']
def parse_dt(s):
@@ -57,7 +57,7 @@ def parse_dt(s):
return local2utc(d)
-class AuMBackend(BaseModule, CapMessages, CapMessagesPost, CapDating, CapChat, CapContact, CapAccount):
+class AuMModule(BaseModule, CapMessages, CapMessagesPost, CapDating, CapChat, CapContact, CapAccount):
NAME = 'aum'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/axabanque/__init__.py b/modules/axabanque/__init__.py
index d07c869b33033ac3457ced662bcf79d501f30430..afbfc365233fd7653dbcaf7c55289d49c8241a0b 100644
--- a/modules/axabanque/__init__.py
+++ b/modules/axabanque/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import AXABanqueBackend
+from .backend import AXABanqueModule
-__all__ = ['AXABanqueBackend']
+__all__ = ['AXABanqueModule']
diff --git a/modules/axabanque/backend.py b/modules/axabanque/backend.py
index 8ef99a07a8b52f9492e7e0bead32dbd284ae7c7d..9242acb5fa9d3bc82c64a7cbb58e2f635cc7b307 100644
--- a/modules/axabanque/backend.py
+++ b/modules/axabanque/backend.py
@@ -25,10 +25,10 @@
from .browser import AXABanque
-__all__ = ['AXABanqueBackend']
+__all__ = ['AXABanqueModule']
-class AXABanqueBackend(BaseModule, CapBank):
+class AXABanqueModule(BaseModule, CapBank):
NAME = 'axabanque'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/banqueaccord/__init__.py b/modules/banqueaccord/__init__.py
index 3b550258970d3ebac13e39da54d4cdf3622e179a..cd6f6e49197ef8ff9ceb066006d8e421447fa8e6 100644
--- a/modules/banqueaccord/__init__.py
+++ b/modules/banqueaccord/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import BanqueAccordBackend
+from .backend import BanqueAccordModule
-__all__ = ['BanqueAccordBackend']
+__all__ = ['BanqueAccordModule']
diff --git a/modules/banqueaccord/backend.py b/modules/banqueaccord/backend.py
index a64823f5b4666bd0bcbd77f500deaf406af82e90..5689308087417ebae19bd88e8a50e401e05ba782 100644
--- a/modules/banqueaccord/backend.py
+++ b/modules/banqueaccord/backend.py
@@ -26,10 +26,10 @@
from .browser import BanqueAccordBrowser
-__all__ = ['BanqueAccordBackend']
+__all__ = ['BanqueAccordModule']
-class BanqueAccordBackend(BaseModule, CapBank):
+class BanqueAccordModule(BaseModule, CapBank):
NAME = 'banqueaccord'
DESCRIPTION = u'Banque Accord'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/banquepopulaire/__init__.py b/modules/banquepopulaire/__init__.py
index 42d432151045b61a2b6b02db5724df8f3d97e5e9..5c5976dd5e43f25483321e09f3d6e1b42787d479 100644
--- a/modules/banquepopulaire/__init__.py
+++ b/modules/banquepopulaire/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import BanquePopulaireBackend
+from .backend import BanquePopulaireModule
-__all__ = ['BanquePopulaireBackend']
+__all__ = ['BanquePopulaireModule']
diff --git a/modules/banquepopulaire/backend.py b/modules/banquepopulaire/backend.py
index 6243e36bd54c2364404ed3e691b7544c61963e6c..93ec4aa468c618f74fa54b9b24eafd39c22bc2e6 100644
--- a/modules/banquepopulaire/backend.py
+++ b/modules/banquepopulaire/backend.py
@@ -26,10 +26,10 @@
from .browser import BanquePopulaire
-__all__ = ['BanquePopulaireBackend']
+__all__ = ['BanquePopulaireModule']
-class BanquePopulaireBackend(BaseModule, CapBank):
+class BanquePopulaireModule(BaseModule, CapBank):
NAME = 'banquepopulaire'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/barclays/__init__.py b/modules/barclays/__init__.py
index 0a9e0b12d3d6b41db532ba4bbd4ea4446357b4d5..f4326c898887febc9c281e915c3aa69e1ec638c1 100644
--- a/modules/barclays/__init__.py
+++ b/modules/barclays/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import BarclaysBackend
+from .backend import BarclaysModule
-__all__ = ['BarclaysBackend']
+__all__ = ['BarclaysModule']
diff --git a/modules/barclays/backend.py b/modules/barclays/backend.py
index fa57dc8be9075f072461e46c24e3c66ac14c4635..8edd74f1c8734d53505be710da6bd4568ae56260 100644
--- a/modules/barclays/backend.py
+++ b/modules/barclays/backend.py
@@ -25,10 +25,10 @@
from .browser import Barclays
-__all__ = ['BarclaysBackend']
+__all__ = ['BarclaysModule']
-class BarclaysBackend(BaseModule, CapBank):
+class BarclaysModule(BaseModule, CapBank):
NAME = 'barclays'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/batoto/__init__.py b/modules/batoto/__init__.py
index 03812b288e09488a4a129bd7eee4e4735aa2e8b6..989f63d4281e02231b3bac4635a876a76de2b03c 100644
--- a/modules/batoto/__init__.py
+++ b/modules/batoto/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import BatotoBackend
+from .backend import BatotoModule
-__all__ = ['BatotoBackend']
+__all__ = ['BatotoModule']
diff --git a/modules/batoto/backend.py b/modules/batoto/backend.py
index 5eb69c69c623d05831fc07f4b6e11964633e5303..dc38f3aac1461cc17a2d5386e0e47de9c3d7416f 100644
--- a/modules/batoto/backend.py
+++ b/modules/batoto/backend.py
@@ -17,12 +17,12 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderBackend, DisplayPage
+from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderModule, DisplayPage
-__all__ = ['BatotoBackend']
+__all__ = ['BatotoModule']
-class BatotoBackend(GenericComicReaderBackend):
+class BatotoModule(GenericComicReaderModule):
NAME = 'batoto'
DESCRIPTION = 'Batoto manga reading website'
DOMAIN = 'www.batoto.com'
diff --git a/modules/biplan/__init__.py b/modules/biplan/__init__.py
index 7292e2b81e090275cd77c9d903499a37eb99864e..eff0db63083d2f348a915855db08bf872c097753 100644
--- a/modules/biplan/__init__.py
+++ b/modules/biplan/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import BiplanBackend
+from .backend import BiplanModule
-__all__ = ['BiplanBackend']
+__all__ = ['BiplanModule']
diff --git a/modules/biplan/backend.py b/modules/biplan/backend.py
index 535dcaaff56975dda9e6c38c4e34bd485bd7691d..3134957860e9c3ee560ccda0cae82fef7f495c8b 100644
--- a/modules/biplan/backend.py
+++ b/modules/biplan/backend.py
@@ -25,10 +25,10 @@
from .browser import BiplanBrowser
from.calendar import BiplanCalendarEvent
-__all__ = ['BiplanBackend']
+__all__ = ['BiplanModule']
-class BiplanBackend(BaseModule, CapCalendarEvent):
+class BiplanModule(BaseModule, CapCalendarEvent):
NAME = 'biplan'
DESCRIPTION = u'lebiplan.org website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/bnporc/__init__.py b/modules/bnporc/__init__.py
index 8b1c26c83acc4fdc28c0a6e5090c5cd04c3f61b7..0a17fa390fe57dbd015ad4bc4a739790c8580956 100644
--- a/modules/bnporc/__init__.py
+++ b/modules/bnporc/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import BNPorcBackend
+from .backend import BNPorcModule
-__all__ = ['BNPorcBackend']
+__all__ = ['BNPorcModule']
diff --git a/modules/bnporc/backend.py b/modules/bnporc/backend.py
index c4cbd9cc5eb905d0ad38fd6ab6c6540fbdfbfc8d..f22c55e29284934ebe352331aaeba6aaeb903b7c 100644
--- a/modules/bnporc/backend.py
+++ b/modules/bnporc/backend.py
@@ -30,10 +30,10 @@
from .enterprise.browser import BNPEnterprise
-__all__ = ['BNPorcBackend']
+__all__ = ['BNPorcModule']
-class BNPorcBackend(BaseModule, CapBank, CapMessages):
+class BNPorcModule(BaseModule, CapBank, CapMessages):
NAME = 'bnporc'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/boursorama/__init__.py b/modules/boursorama/__init__.py
index 7766c0c4ea8bac38c35f06d65dfbbe05cfdc2cf2..c82e97e76e5ac841680b94a019c38b4c9d2693f0 100644
--- a/modules/boursorama/__init__.py
+++ b/modules/boursorama/__init__.py
@@ -19,6 +19,6 @@
# along with weboob. If not, see .
-from .backend import BoursoramaBackend
+from .backend import BoursoramaModule
-__all__ = ['BoursoramaBackend']
+__all__ = ['BoursoramaModule']
diff --git a/modules/boursorama/backend.py b/modules/boursorama/backend.py
index fc2f95c8f8d5eddf1497c7cf1ba16a0ad5f14c38..a8c02e882f74fee52d0cbfc30d33f67542df49e4 100644
--- a/modules/boursorama/backend.py
+++ b/modules/boursorama/backend.py
@@ -27,10 +27,10 @@
from .browser import Boursorama
-__all__ = ['BoursoramaBackend']
+__all__ = ['BoursoramaModule']
-class BoursoramaBackend(BaseModule, CapBank):
+class BoursoramaModule(BaseModule, CapBank):
NAME = 'boursorama'
MAINTAINER = u'Gabriel Kerneis'
EMAIL = 'gabriel@kerneis.info'
diff --git a/modules/bouygues/__init__.py b/modules/bouygues/__init__.py
index 383d76f22b8188831a089f9f104bbe77a1653329..97018349a5abfb15938d161786be13611dd8d7c2 100644
--- a/modules/bouygues/__init__.py
+++ b/modules/bouygues/__init__.py
@@ -1,3 +1,3 @@
-from .backend import BouyguesBackend
+from .backend import BouyguesModule
-__all__ = ['BouyguesBackend']
+__all__ = ['BouyguesModule']
diff --git a/modules/bouygues/backend.py b/modules/bouygues/backend.py
index 6d7a2e233dd2821325d9d699bc5fef47c161f63a..40957890664b1a8c436934205d7fe02f86f52716 100644
--- a/modules/bouygues/backend.py
+++ b/modules/bouygues/backend.py
@@ -27,10 +27,10 @@
from .browser import BouyguesBrowser
-__all__ = ['BouyguesBackend']
+__all__ = ['BouyguesModule']
-class BouyguesBackend(BaseModule, CapMessages, CapMessagesPost):
+class BouyguesModule(BaseModule, CapMessages, CapMessagesPost):
NAME = 'bouygues'
MAINTAINER = u'Christophe Benz'
EMAIL = 'christophe.benz@gmail.com'
diff --git a/modules/bp/__init__.py b/modules/bp/__init__.py
index 0276ae95b7150a6a07189711edfe3d96e27e3789..8e077d6063a11a06023795e545ad627a7fe75303 100644
--- a/modules/bp/__init__.py
+++ b/modules/bp/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import BPBackend
+from .backend import BPModule
-__all__ = ['BPBackend']
+__all__ = ['BPModule']
diff --git a/modules/bp/backend.py b/modules/bp/backend.py
index 180cb34ddf502d4dbfbf6adbfe98e7ffce8b4501..35ff07e3cd15263922954fa6e4e28e1375d5951b 100644
--- a/modules/bp/backend.py
+++ b/modules/bp/backend.py
@@ -25,10 +25,10 @@
from .browser import BPBrowser
-__all__ = ['BPBackend']
+__all__ = ['BPModule']
-class BPBackend(BaseModule, CapBank):
+class BPModule(BaseModule, CapBank):
NAME = 'bp'
MAINTAINER = u'Nicolas Duhamel'
EMAIL = 'nicolas@jombi.fr'
diff --git a/modules/bred/__init__.py b/modules/bred/__init__.py
index 3b649d6ca1360a21dd04e39ae960c108cf7bc66f..580fb4cbc6f63e99a1ffaabffead01f551bacf5d 100644
--- a/modules/bred/__init__.py
+++ b/modules/bred/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import BredBackend
+from .backend import BredModule
-__all__ = ['BredBackend']
+__all__ = ['BredModule']
diff --git a/modules/bred/backend.py b/modules/bred/backend.py
index 6bd5247921c75a6a491f4e9ab96969acc2f502fd..1cf61973b028d3c1c73e0a05ede276581ab13fc2 100644
--- a/modules/bred/backend.py
+++ b/modules/bred/backend.py
@@ -26,10 +26,10 @@
from .browser import BredBrowser
-__all__ = ['BredBackend']
+__all__ = ['BredModule']
-class BredBackend(BaseModule, CapBank):
+class BredModule(BaseModule, CapBank):
NAME = 'bred'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/btdigg/__init__.py b/modules/btdigg/__init__.py
index b3e120559f34a5896ffed73180bdbc67e029a364..ede0e4863f7582fcb74169b26c8725a731cb95cc 100644
--- a/modules/btdigg/__init__.py
+++ b/modules/btdigg/__init__.py
@@ -1,3 +1,3 @@
-from .backend import BTDiggBackend
+from .backend import BTDiggModule
-__all__ = ['BTDiggBackend']
+__all__ = ['BTDiggModule']
diff --git a/modules/btdigg/backend.py b/modules/btdigg/backend.py
index 1c0b2e9bdc0a1b6cc3d3af2c5934a4274173308d..db502fe400f1bed529286812e671bb353b7cdc6d 100644
--- a/modules/btdigg/backend.py
+++ b/modules/btdigg/backend.py
@@ -6,9 +6,9 @@
from .browser import BTDiggBrowser
-__all__ = ['BTDiggBackend']
+__all__ = ['BTDiggModule']
-class BTDiggBackend(BaseModule, CapTorrent):
+class BTDiggModule(BaseModule, CapTorrent):
NAME = 'btdigg'
MAINTAINER = u'Matthieu Rakotojaona'
EMAIL = 'matthieu.rakotojaona@gmail.com'
diff --git a/modules/btmon/__init__.py b/modules/btmon/__init__.py
index 4d2f954b01ffdf780fa8bc484499ea7958a94107..cdea8279ad5ec43a73372c429c4ae2b5c1999193 100644
--- a/modules/btmon/__init__.py
+++ b/modules/btmon/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import BtmonBackend
+from .backend import BtmonModule
-__all__ = ['BtmonBackend']
+__all__ = ['BtmonModule']
diff --git a/modules/btmon/backend.py b/modules/btmon/backend.py
index b12a1b15f60a45a23a96daa8ea940d53fdb2b666..51fc77feb211c9b150adffe27206ade40762d38d 100644
--- a/modules/btmon/backend.py
+++ b/modules/btmon/backend.py
@@ -24,10 +24,10 @@
from urllib import quote_plus
-__all__ = ['BtmonBackend']
+__all__ = ['BtmonModule']
-class BtmonBackend(BaseModule, CapTorrent):
+class BtmonModule(BaseModule, CapTorrent):
NAME = 'btmon'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/caissedepargne/__init__.py b/modules/caissedepargne/__init__.py
index 60e83a4abafb6c3a6c3452699e109c66a824d2b4..0592c80cbad5bca19974075857fd91e8207a50db 100644
--- a/modules/caissedepargne/__init__.py
+++ b/modules/caissedepargne/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CaisseEpargneBackend
+from .backend import CaisseEpargneModule
-__all__ = ['CaisseEpargneBackend']
+__all__ = ['CaisseEpargneModule']
diff --git a/modules/caissedepargne/backend.py b/modules/caissedepargne/backend.py
index 630d739120fdcf68f489b3f358a8c274b7d200bc..ce46d61286d042b4cf786897ec2dd0c33242b66a 100644
--- a/modules/caissedepargne/backend.py
+++ b/modules/caissedepargne/backend.py
@@ -25,10 +25,10 @@
from .browser import CaisseEpargne
-__all__ = ['CaisseEpargneBackend']
+__all__ = ['CaisseEpargneModule']
-class CaisseEpargneBackend(BaseModule, CapBank):
+class CaisseEpargneModule(BaseModule, CapBank):
NAME = 'caissedepargne'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/canalplus/__init__.py b/modules/canalplus/__init__.py
index 40f75412d2b86853168338f0f4792ed4aa1ac9db..cdbaf3bf1a8ea6a35ca4d59ef3716f8e7c505b95 100644
--- a/modules/canalplus/__init__.py
+++ b/modules/canalplus/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import CanalplusBackend
+from .backend import CanalplusModule
-__all__ = ['CanalplusBackend']
+__all__ = ['CanalplusModule']
diff --git a/modules/canalplus/backend.py b/modules/canalplus/backend.py
index cfb3f256393343bc489132457d4f9520d4262591..e7ecb66e3480e5067d48b51f44c2b313f700e0a0 100644
--- a/modules/canalplus/backend.py
+++ b/modules/canalplus/backend.py
@@ -29,10 +29,10 @@
from weboob.capabilities.collection import CapCollection
-__all__ = ['CanalplusBackend']
+__all__ = ['CanalplusModule']
-class CanalplusBackend(BaseModule, CapVideo, CapCollection):
+class CanalplusModule(BaseModule, CapVideo, CapCollection):
NAME = 'canalplus'
MAINTAINER = u'Nicolas Duhamel'
EMAIL = 'nicolas@jombi.fr'
diff --git a/modules/canaltp/__init__.py b/modules/canaltp/__init__.py
index 8e48aae2450b872e7798b7e8297c261abde0873e..29c7c06d26234141b96b076cc57bfd6826b822ab 100644
--- a/modules/canaltp/__init__.py
+++ b/modules/canaltp/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CanalTPBackend
+from .backend import CanalTPModule
-__all__ = ['CanalTPBackend']
+__all__ = ['CanalTPModule']
diff --git a/modules/canaltp/backend.py b/modules/canaltp/backend.py
index 031a5219f4f460fd3c876c803189f8d5a49bc811..fdeda7b8d4b40474bb63ef33d24344347b331110 100644
--- a/modules/canaltp/backend.py
+++ b/modules/canaltp/backend.py
@@ -23,10 +23,10 @@
from .browser import CanalTP
-__all__ = ['CanalTPBackend']
+__all__ = ['CanalTPModule']
-class CanalTPBackend(BaseModule, CapTravel):
+class CanalTPModule(BaseModule, CapTravel):
NAME = 'canaltp'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/cappedtv/__init__.py b/modules/cappedtv/__init__.py
index 3030b9c18904dacaadbeb12e26d0bc828d8e809d..b5450ee74d5ed79a10bf99cfbf022bb7bd17bc86 100644
--- a/modules/cappedtv/__init__.py
+++ b/modules/cappedtv/__init__.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from .backend import CappedBackend
+from .backend import CappedModule
-__all__ = ['CappedBackend']
+__all__ = ['CappedModule']
diff --git a/modules/cappedtv/backend.py b/modules/cappedtv/backend.py
index 2cb28062df7cfdf355c9bf6a4e0c540b74074941..b72c00e95005ef81bab94ba6668fd726c08d7e46 100644
--- a/modules/cappedtv/backend.py
+++ b/modules/cappedtv/backend.py
@@ -16,10 +16,10 @@
from .browser import CappedBrowser, CappedVideo
-__all__ = ['CappedBackend']
+__all__ = ['CappedModule']
-class CappedBackend(BaseModule, CapVideo, CapCollection):
+class CappedModule(BaseModule, CapVideo, CapCollection):
NAME = 'cappedtv'
MAINTAINER = u'Lord'
EMAIL = 'lord@lordtoniok.com'
diff --git a/modules/carrefourbanque/__init__.py b/modules/carrefourbanque/__init__.py
index c00a085f33d53d29d23e567c572f1d1dd96b4eb8..a8543567759c0dabda329a887a5ca53c16bd9ac7 100644
--- a/modules/carrefourbanque/__init__.py
+++ b/modules/carrefourbanque/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CarrefourBanqueBackend
+from .backend import CarrefourBanqueModule
-__all__ = ['CarrefourBanqueBackend']
+__all__ = ['CarrefourBanqueModule']
diff --git a/modules/carrefourbanque/backend.py b/modules/carrefourbanque/backend.py
index 88bbc6f1766356e54965e5ec6072d3fdfb4f5fc5..33f392477d3e4a8778f1e0cda123d441cd594705 100644
--- a/modules/carrefourbanque/backend.py
+++ b/modules/carrefourbanque/backend.py
@@ -26,10 +26,10 @@
from .browser import CarrefourBanque
-__all__ = ['CarrefourBanqueBackend']
+__all__ = ['CarrefourBanqueModule']
-class CarrefourBanqueBackend(BaseModule, CapBank):
+class CarrefourBanqueModule(BaseModule, CapBank):
NAME = 'carrefourbanque'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/cci/__init__.py b/modules/cci/__init__.py
index a8957098195f087b626a2392435730404f3a7ea1..add8c2902d8359129d5c625342d696397068ed03 100644
--- a/modules/cci/__init__.py
+++ b/modules/cci/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import CciBackend
+from .backend import CciModule
-__all__ = ['CciBackend']
+__all__ = ['CciModule']
diff --git a/modules/cci/backend.py b/modules/cci/backend.py
index 270d1388083bbf242cd6e2c65555cf00e3d5a35c..8842f790a51ffdab4d7ed100877dbd3331d12af8 100644
--- a/modules/cci/backend.py
+++ b/modules/cci/backend.py
@@ -25,10 +25,10 @@
from .browser import CciBrowser
-__all__ = ['CciBackend']
+__all__ = ['CciModule']
-class CciBackend(BaseModule, CapJob):
+class CciModule(BaseModule, CapJob):
NAME = 'cci'
DESCRIPTION = u'cci website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/champslibres/__init__.py b/modules/champslibres/__init__.py
index 1646af73753130e17458cb41c040e250839a4489..c09e49d73a800aab6e9cf1311d30382a4bab1069 100644
--- a/modules/champslibres/__init__.py
+++ b/modules/champslibres/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import ChampslibresBackend
+from .backend import ChampslibresModule
-__all__ = ['ChampslibresBackend']
+__all__ = ['ChampslibresModule']
diff --git a/modules/champslibres/backend.py b/modules/champslibres/backend.py
index ed02258f7d2459142c021ac395b4d4c52148ec49..072554d4d9984cbf059b5f397204bec0d8a2f95b 100644
--- a/modules/champslibres/backend.py
+++ b/modules/champslibres/backend.py
@@ -25,10 +25,10 @@
from .browser import ChampslibresBrowser
-__all__ = ['ChampslibresBackend']
+__all__ = ['ChampslibresModule']
-class ChampslibresBackend(BaseModule, CapBook):
+class ChampslibresModule(BaseModule, CapBook):
NAME = 'champslibres'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/chronopost/__init__.py b/modules/chronopost/__init__.py
index 838501d80357671375c45893d1a36a92aa285701..c44db3570c9d1d942d94f3ba8ae12498fa4c3f29 100644
--- a/modules/chronopost/__init__.py
+++ b/modules/chronopost/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import ChronopostBackend
+from .backend import ChronopostModule
-__all__ = ['ChronopostBackend']
+__all__ = ['ChronopostModule']
diff --git a/modules/chronopost/backend.py b/modules/chronopost/backend.py
index 1015bb86470b112006cf80149a9c8a9ab960eff0..e0299ab12c66e41a6809d88921c45a09df7ad1d6 100644
--- a/modules/chronopost/backend.py
+++ b/modules/chronopost/backend.py
@@ -24,10 +24,10 @@
from .browser import ChronopostBrowser
-__all__ = ['ChronopostBackend']
+__all__ = ['ChronopostModule']
-class ChronopostBackend(BaseModule, CapParcel):
+class ChronopostModule(BaseModule, CapParcel):
NAME = 'chronopost'
DESCRIPTION = u'Chronopost website'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/cic/__init__.py b/modules/cic/__init__.py
index 1269164e8b818c6d258f59bccde1b4a2960d6cb8..8e3f6361d1e31614083d487af8b5e34ac1a7d2d8 100644
--- a/modules/cic/__init__.py
+++ b/modules/cic/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CICBackend
+from .backend import CICModule
-__all__ = ['CICBackend']
+__all__ = ['CICModule']
diff --git a/modules/cic/backend.py b/modules/cic/backend.py
index 5833d93aacc06707bc7d7548fe3afdc238d58516..0a37e798f8073edf3670c3f4b60e5529118c70dc 100644
--- a/modules/cic/backend.py
+++ b/modules/cic/backend.py
@@ -29,10 +29,10 @@
from .browser import CICBrowser
-__all__ = ['CICBackend']
+__all__ = ['CICModule']
-class CICBackend(BaseModule, CapBank):
+class CICModule(BaseModule, CapBank):
NAME = 'cic'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/citelis/__init__.py b/modules/citelis/__init__.py
index 424110988d75f4a426eddd2204c5a86d0943e9e0..90762e890587c8117d35ad38fe5a1c88caa13684 100644
--- a/modules/citelis/__init__.py
+++ b/modules/citelis/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import CitelisBackend
+from .backend import CitelisModule
-__all__ = ['CitelisBackend']
+__all__ = ['CitelisModule']
diff --git a/modules/citelis/backend.py b/modules/citelis/backend.py
index 52999544382b1a4e4fc7ffa4afabdc9ee9d46d87..49b93c3495d0ad8ab772363d39491fb45a134a96 100644
--- a/modules/citelis/backend.py
+++ b/modules/citelis/backend.py
@@ -25,10 +25,10 @@
from .browser import CitelisBrowser
-__all__ = ['CitelisBackend']
+__all__ = ['CitelisModule']
-class CitelisBackend(BaseModule, CapBank):
+class CitelisModule(BaseModule, CapBank):
NAME = 'citelis'
DESCRIPTION = u'Citélis'
MAINTAINER = u'Laurent Bachelier'
diff --git a/modules/cmb/__init__.py b/modules/cmb/__init__.py
index e83e31986e8ee4d17e6f67fa01c52e6dbbf136d8..2e58624b2c7ac9b72f2989203df99b074dc465c1 100644
--- a/modules/cmb/__init__.py
+++ b/modules/cmb/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CmbBackend
+from .backend import CmbModule
-__all__ = ['CmbBackend']
+__all__ = ['CmbModule']
diff --git a/modules/cmb/backend.py b/modules/cmb/backend.py
index 97194740913a2ed957ecc9749f671e0f7ae1d00a..f1dabec6ee8cd1cf5c6111d1f580490bb867710e 100644
--- a/modules/cmb/backend.py
+++ b/modules/cmb/backend.py
@@ -33,10 +33,10 @@
-__all__ = ['CmbBackend']
+__all__ = ['CmbModule']
-class CmbBackend(BaseModule, CapBank):
+class CmbModule(BaseModule, CapBank):
NAME = 'cmb'
MAINTAINER = u'Johann Broudin'
EMAIL = 'Johann.Broudin@6-8.fr'
diff --git a/modules/cmso/__init__.py b/modules/cmso/__init__.py
index aaa435e0ee3d6afa9e2ec716d90cbf502347cedc..2b16c6cf17f846e20757470b7b4f5f119145bc8f 100644
--- a/modules/cmso/__init__.py
+++ b/modules/cmso/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CmsoBackend
+from .backend import CmsoModule
-__all__ = ['CmsoBackend']
+__all__ = ['CmsoModule']
diff --git a/modules/cmso/backend.py b/modules/cmso/backend.py
index e185f30699bc16b0d5734b05eb1bb95664182f34..6d54b46a220826828e8401fbfeb5e3926ace24b1 100644
--- a/modules/cmso/backend.py
+++ b/modules/cmso/backend.py
@@ -25,10 +25,10 @@
from .browser import Cmso
-__all__ = ['CmsoBackend']
+__all__ = ['CmsoModule']
-class CmsoBackend(BaseModule, CapBank):
+class CmsoModule(BaseModule, CapBank):
NAME = 'cmso'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/colisprive/__init__.py b/modules/colisprive/__init__.py
index 27e92c232b9dc28feb5be2a3baecd5e5be4dd3f1..904b4ea0bafcd888cb52bcc0f79e15e5b64a42f2 100644
--- a/modules/colisprive/__init__.py
+++ b/modules/colisprive/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import ColispriveBackend
+from .backend import ColispriveModule
-__all__ = ['ColispriveBackend']
+__all__ = ['ColispriveModule']
diff --git a/modules/colisprive/backend.py b/modules/colisprive/backend.py
index 73df1c4513a21119a313ac368d67654a374d45a1..c66565e75bab69fffa66703f0e098de186639631 100644
--- a/modules/colisprive/backend.py
+++ b/modules/colisprive/backend.py
@@ -22,10 +22,10 @@
from .browser import ColispriveBrowser
-__all__ = ['ColispriveBackend']
+__all__ = ['ColispriveModule']
-class ColispriveBackend(BaseModule, CapParcel):
+class ColispriveModule(BaseModule, CapParcel):
NAME = 'colisprive'
DESCRIPTION = u'Colisprive parcel tracking website'
MAINTAINER = u'Florent Fourcot'
diff --git a/modules/colissimo/__init__.py b/modules/colissimo/__init__.py
index 15deaef87beb29265982ca945ea9f423cd717b24..463cb1dbc4091c0757c3c8c070ed9b3032d32bc3 100644
--- a/modules/colissimo/__init__.py
+++ b/modules/colissimo/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import ColissimoBackend
+from .backend import ColissimoModule
-__all__ = ['ColissimoBackend']
+__all__ = ['ColissimoModule']
diff --git a/modules/colissimo/backend.py b/modules/colissimo/backend.py
index f51601f395cffa61f04fef41f97fe715f6255581..0ebdc00a5d634dd8b6bbd04e398866c1222381d8 100644
--- a/modules/colissimo/backend.py
+++ b/modules/colissimo/backend.py
@@ -23,10 +23,10 @@
from .browser import ColissimoBrowser
from datetime import date
-__all__ = ['ColissimoBackend']
+__all__ = ['ColissimoModule']
-class ColissimoBackend(BaseModule, CapParcel):
+class ColissimoModule(BaseModule, CapParcel):
NAME = 'colissimo'
DESCRIPTION = u'Colissimo parcel tracking website'
MAINTAINER = u'Florent Fourcot'
diff --git a/modules/cragr/__init__.py b/modules/cragr/__init__.py
index b001581be8cddaad9434124937fa2048cddb6d16..69414d950ec12a870542f697e4bb34467535a13b 100644
--- a/modules/cragr/__init__.py
+++ b/modules/cragr/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CragrBackend
+from .backend import CragrModule
-__all__ = ['CragrBackend']
+__all__ = ['CragrModule']
diff --git a/modules/cragr/backend.py b/modules/cragr/backend.py
index 01835a538cb2238b0d5dc5996f4a735298a49a57..96ea72449c8ebfcbe53b5713428e33ad1e7dae42 100644
--- a/modules/cragr/backend.py
+++ b/modules/cragr/backend.py
@@ -27,10 +27,10 @@
from .mobile.browser import CragrMobile
-__all__ = ['CragrBackend']
+__all__ = ['CragrModule']
-class CragrBackend(BaseModule, CapBank):
+class CragrModule(BaseModule, CapBank):
NAME = 'cragr'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/creditcooperatif/__init__.py b/modules/creditcooperatif/__init__.py
index 7b95a7c592d3a3c339efc7b97da27755e557dfde..5b70dfd5f36e38d4227d832364b6d54c731933f3 100644
--- a/modules/creditcooperatif/__init__.py
+++ b/modules/creditcooperatif/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CreditCooperatifBackend
+from .backend import CreditCooperatifModule
-__all__ = ['CreditCooperatifBackend']
+__all__ = ['CreditCooperatifModule']
diff --git a/modules/creditcooperatif/backend.py b/modules/creditcooperatif/backend.py
index d9b8cb10d58ebaf5f876f597f828ea99058bee95..aedece5cbcbf880921cd1864265050ba440187ae 100644
--- a/modules/creditcooperatif/backend.py
+++ b/modules/creditcooperatif/backend.py
@@ -26,10 +26,10 @@
from .pro.browser import CreditCooperatif as CreditCooperatifPro
-__all__ = ['CreditCooperatifBackend']
+__all__ = ['CreditCooperatifModule']
-class CreditCooperatifBackend(BaseModule, CapBank):
+class CreditCooperatifModule(BaseModule, CapBank):
NAME = 'creditcooperatif'
MAINTAINER = u'Kevin Pouget'
EMAIL = 'weboob@kevin.pouget.me'
diff --git a/modules/creditdunord/__init__.py b/modules/creditdunord/__init__.py
index dabc8016a88c2c5f9f5acc92a02ed8b56af09a6b..bf755983bae732add87737946a0e03ded564c53f 100644
--- a/modules/creditdunord/__init__.py
+++ b/modules/creditdunord/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CreditDuNordBackend
+from .backend import CreditDuNordModule
-__all__ = ['CreditDuNordBackend']
+__all__ = ['CreditDuNordModule']
diff --git a/modules/creditdunord/backend.py b/modules/creditdunord/backend.py
index a6201a59b3692a4f9d9e8df8b63c31663dff515f..42309e5c395d9e615f8da808a276a170a20a9a1b 100644
--- a/modules/creditdunord/backend.py
+++ b/modules/creditdunord/backend.py
@@ -27,10 +27,10 @@
from .browser import CreditDuNordBrowser
-__all__ = ['CreditDuNordBackend']
+__all__ = ['CreditDuNordModule']
-class CreditDuNordBackend(BaseModule, CapBank):
+class CreditDuNordModule(BaseModule, CapBank):
NAME = 'creditdunord'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/creditmutuel/__init__.py b/modules/creditmutuel/__init__.py
index e14a4d95f206038b7d990ca5cc3479454ac70d2c..e7d8b3a5e61f0ef0048ce8916491bddec47820b5 100644
--- a/modules/creditmutuel/__init__.py
+++ b/modules/creditmutuel/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import CreditMutuelBackend
+from .backend import CreditMutuelModule
-__all__ = ['CreditMutuelBackend']
+__all__ = ['CreditMutuelModule']
diff --git a/modules/creditmutuel/backend.py b/modules/creditmutuel/backend.py
index ef6be0cdaa03ab6ba88059846112a106e99f5b68..0eb91d0296482035f7228017e7673b080664e75e 100644
--- a/modules/creditmutuel/backend.py
+++ b/modules/creditmutuel/backend.py
@@ -30,10 +30,10 @@
from .browser import CreditMutuelBrowser
-__all__ = ['CreditMutuelBackend']
+__all__ = ['CreditMutuelModule']
-class CreditMutuelBackend(BaseModule, CapBank):
+class CreditMutuelModule(BaseModule, CapBank):
NAME = 'creditmutuel'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/cuisineaz/__init__.py b/modules/cuisineaz/__init__.py
index f8b90bc805cf4c5b6015bb0a3e207344abf8041b..6cad691ca8d7cea8ccb2e15a1428bfa0781bd78e 100644
--- a/modules/cuisineaz/__init__.py
+++ b/modules/cuisineaz/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import CuisineazBackend
+from .backend import CuisineazModule
-__all__ = ['CuisineazBackend']
+__all__ = ['CuisineazModule']
diff --git a/modules/cuisineaz/backend.py b/modules/cuisineaz/backend.py
index 5a503e7371142469711759c4064b0eb17964897c..c8ba9a93b98ab578bbf5b9eabc5e89926162e55a 100644
--- a/modules/cuisineaz/backend.py
+++ b/modules/cuisineaz/backend.py
@@ -24,13 +24,13 @@
import unicodedata
-__all__ = ['CuisineazBackend']
+__all__ = ['CuisineazModule']
def strip_accents(s):
return ''.join(c for c in unicodedata.normalize('NFD', s) if unicodedata.category(c) != 'Mn')
-class CuisineazBackend(BaseModule, CapRecipe):
+class CuisineazModule(BaseModule, CapRecipe):
NAME = 'cuisineaz'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/dailymotion/__init__.py b/modules/dailymotion/__init__.py
index b54c8a2cb6dcf656d7a91b072f4bcd4f75b9a165..fb1e861e6ced0c582d9331662fbe96966e6b1f00 100644
--- a/modules/dailymotion/__init__.py
+++ b/modules/dailymotion/__init__.py
@@ -1,3 +1,3 @@
-from .backend import DailymotionBackend
+from .backend import DailymotionModule
-__all__ = ['DailymotionBackend']
+__all__ = ['DailymotionModule']
diff --git a/modules/dailymotion/backend.py b/modules/dailymotion/backend.py
index ffd6dc916aeedd0e4805235334b58f07d32a60b4..14e49be404449f52d84cc56dc894c2994cdd1117 100644
--- a/modules/dailymotion/backend.py
+++ b/modules/dailymotion/backend.py
@@ -25,10 +25,10 @@
from .video import DailymotionVideo
-__all__ = ['DailymotionBackend']
+__all__ = ['DailymotionModule']
-class DailymotionBackend(BaseModule, CapVideo, CapCollection):
+class DailymotionModule(BaseModule, CapVideo, CapCollection):
NAME = 'dailymotion'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/delubac/__init__.py b/modules/delubac/__init__.py
index 456fc62c2dcfd7fc0c9c3c021091f579e82dcf7e..d283f4c67428c1fa24487cc1233099be42ce487e 100644
--- a/modules/delubac/__init__.py
+++ b/modules/delubac/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import DelubacBackend
+from .backend import DelubacModule
-__all__ = ['DelubacBackend']
+__all__ = ['DelubacModule']
diff --git a/modules/delubac/backend.py b/modules/delubac/backend.py
index bd119931ba8865d572b600ab22a61429d02b42ac..c63c35817c090b992208812b9c3fab35de021d1e 100644
--- a/modules/delubac/backend.py
+++ b/modules/delubac/backend.py
@@ -24,10 +24,10 @@
from .browser import DelubacBrowser
-__all__ = ['DelubacBackend']
+__all__ = ['DelubacModule']
-class DelubacBackend(BaseModule, CapBank):
+class DelubacModule(BaseModule, CapBank):
NAME = 'delubac'
DESCRIPTION = u'Banque Delubac & Cie'
MAINTAINER = u'Noe Rubinstein'
diff --git a/modules/dlfp/__init__.py b/modules/dlfp/__init__.py
index 8cf5dfd2e8c0fbd3961f8926ec8d1542529d018b..139e52e333d27ea0033eade0dc3f066cb0c310c5 100644
--- a/modules/dlfp/__init__.py
+++ b/modules/dlfp/__init__.py
@@ -19,6 +19,6 @@
from .browser import DLFP
-from .backend import DLFPBackend
+from .backend import DLFPModule
-__all__ = ['DLFP', 'DLFPBackend']
+__all__ = ['DLFP', 'DLFPModule']
diff --git a/modules/dlfp/backend.py b/modules/dlfp/backend.py
index 79760eeb8694371a9844aa0bdb3bd3e076b17387..4ac1d0e6f22bbe5283069f6292fa06975781b7f4 100644
--- a/modules/dlfp/backend.py
+++ b/modules/dlfp/backend.py
@@ -34,10 +34,10 @@
from .tools import rssid, id2url
-__all__ = ['DLFPBackend']
+__all__ = ['DLFPModule']
-class DLFPBackend(BaseModule, CapMessages, CapMessagesPost, CapContent):
+class DLFPModule(BaseModule, CapMessages, CapMessagesPost, CapContent):
NAME = 'dlfp'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/dresdenwetter/__init__.py b/modules/dresdenwetter/__init__.py
index 2d2e511da9a8ea9d94cd8c3a463f8d18c42a9901..a6ea4d532285f01a64ab8728b781fe9d47827d6a 100644
--- a/modules/dresdenwetter/__init__.py
+++ b/modules/dresdenwetter/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import DresdenWetterBackend
+from .backend import DresdenWetterModule
-__all__ = ['DresdenWetterBackend']
+__all__ = ['DresdenWetterModule']
diff --git a/modules/dresdenwetter/backend.py b/modules/dresdenwetter/backend.py
index 89cc1efa307b158ac8b4785dc4c2663f3df0724b..163c3d30e9980f692c4d0c4b80691908d37fdcda 100644
--- a/modules/dresdenwetter/backend.py
+++ b/modules/dresdenwetter/backend.py
@@ -25,10 +25,10 @@
from weboob.tools.backend import BaseModule
-__all__ = ['DresdenWetterBackend']
+__all__ = ['DresdenWetterModule']
-class DresdenWetterBackend(BaseModule, CapGauge):
+class DresdenWetterModule(BaseModule, CapGauge):
NAME = 'dresdenwetter'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/eatmanga/__init__.py b/modules/eatmanga/__init__.py
index 1b8d97d1c7023647083c6cf583bbc7fad26efaee..0475d52df53e70712618b40541763d5114dec2f7 100644
--- a/modules/eatmanga/__init__.py
+++ b/modules/eatmanga/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import EatmangaBackend
+from .backend import EatmangaModule
-__all__ = ['EatmangaBackend']
+__all__ = ['EatmangaModule']
diff --git a/modules/eatmanga/backend.py b/modules/eatmanga/backend.py
index 3b8279e5bf08c2f1f90b78f2dece2ffff9789383..6271f0ad243a71e0db7471323c4d3f2c110aedac 100644
--- a/modules/eatmanga/backend.py
+++ b/modules/eatmanga/backend.py
@@ -17,12 +17,12 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderBackend, DisplayPage
+from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderModule, DisplayPage
-__all__ = ['EatmangaBackend']
+__all__ = ['EatmangaModule']
-class EatmangaBackend(GenericComicReaderBackend):
+class EatmangaModule(GenericComicReaderModule):
NAME = 'eatmanga'
DESCRIPTION = 'EatManga manga reading website'
DOMAIN = 'www.eatmanga.com'
diff --git a/modules/ebonics/__init__.py b/modules/ebonics/__init__.py
index 12efd3bf6dc134352a9e341dd6e7bc513aa2739b..129bdd4ee2fd8eb514ca45689cad19f6f997436a 100644
--- a/modules/ebonics/__init__.py
+++ b/modules/ebonics/__init__.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 .backend import EbonicsBackend
+from .backend import EbonicsModule
-__all__ = ['EbonicsBackend']
+__all__ = ['EbonicsModule']
diff --git a/modules/ebonics/backend.py b/modules/ebonics/backend.py
index 0b55f7e28883d693c9cdc68f8fe4fbf98146a5a7..c914a22c765f45f90e49e0f29ad2d15dd7b0a5f7 100644
--- a/modules/ebonics/backend.py
+++ b/modules/ebonics/backend.py
@@ -25,10 +25,10 @@
from weboob.tools.browser import StandardBrowser
-__all__ = ['EbonicsBackend']
+__all__ = ['EbonicsModule']
-class EbonicsBackend(BaseModule, CapTranslate):
+class EbonicsModule(BaseModule, CapTranslate):
NAME = 'ebonics'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/edf/__init__.py b/modules/edf/__init__.py
index fa2bfdd5da1eacf6f87440de9236a741ebc09cc2..26665f0998bb460e4318e2da72d08951fc78e949 100644
--- a/modules/edf/__init__.py
+++ b/modules/edf/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import EdfBackend
+from .backend import EdfModule
-__all__ = ['EdfBackend']
+__all__ = ['EdfModule']
diff --git a/modules/edf/backend.py b/modules/edf/backend.py
index 13cd3207b291fc596dbfb66a8e5a13915587d4b9..52011875999df5fde3b9bc2e5029f7363a83c0e8 100644
--- a/modules/edf/backend.py
+++ b/modules/edf/backend.py
@@ -22,10 +22,10 @@
from weboob.tools.value import ValueBackendPassword
from .browser import EdfBrowser
-__all__ = ['EdfBackend']
+__all__ = ['EdfModule']
-class EdfBackend(BaseModule, CapBill):
+class EdfModule(BaseModule, CapBill):
NAME = 'edf'
DESCRIPTION = u'Edf website: French power provider'
MAINTAINER = u'Christophe Gouiran'
diff --git a/modules/ehentai/__init__.py b/modules/ehentai/__init__.py
index cc13468901cd4a1484d7279bf3c94bdd234b0372..15fbd7211463185322636eedcc5fede948b44389 100644
--- a/modules/ehentai/__init__.py
+++ b/modules/ehentai/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import EHentaiBackend
+from .backend import EHentaiModule
-__all__ = ['EHentaiBackend']
+__all__ = ['EHentaiModule']
diff --git a/modules/ehentai/backend.py b/modules/ehentai/backend.py
index 8a25f41291b72e4b410059aefd4f99a9864c415b..c080e0b5b9bdf52e36d302b11e13dbf7eea67c1d 100644
--- a/modules/ehentai/backend.py
+++ b/modules/ehentai/backend.py
@@ -30,10 +30,10 @@
from .gallery import EHentaiGallery, EHentaiImage
-__all__ = ['EHentaiBackend']
+__all__ = ['EHentaiModule']
-class EHentaiBackend(BaseModule, CapGallery, CapCollection):
+class EHentaiModule(BaseModule, CapGallery, CapCollection):
NAME = 'ehentai'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
diff --git a/modules/europarl/__init__.py b/modules/europarl/__init__.py
index 0994ffedc301ea83bf4a225a4f2edc78762f9948..116c61297c57b242a0d1e76d25a1732d2734835d 100644
--- a/modules/europarl/__init__.py
+++ b/modules/europarl/__init__.py
@@ -1,3 +1,3 @@
-from .backend import EuroparlBackend
+from .backend import EuroparlModule
-__all__ = ['EuroparlBackend']
+__all__ = ['EuroparlModule']
diff --git a/modules/europarl/backend.py b/modules/europarl/backend.py
index b06c25fdbcbd854d5bfb4f5d3ca2fe9a58f9f839..338e05df0cd51e4ce58fbded7718788ef0b742eb 100644
--- a/modules/europarl/backend.py
+++ b/modules/europarl/backend.py
@@ -29,10 +29,10 @@
from .video import EuroparlVideo
-__all__ = ['EuroparlBackend']
+__all__ = ['EuroparlModule']
-class EuroparlBackend(BaseModule, CapVideo, CapCollection):
+class EuroparlModule(BaseModule, CapVideo, CapCollection):
NAME = 'europarl'
MAINTAINER = u'François Revol'
EMAIL = 'revol@free.fr'
diff --git a/modules/feedly/__init__.py b/modules/feedly/__init__.py
index a3c4a9dd123a68c640c9ccbfb6418124997f96d1..cc7c999b5b11b8a1e9f4b48d0aada9cd49031460 100644
--- a/modules/feedly/__init__.py
+++ b/modules/feedly/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import FeedlyBackend
+from .backend import FeedlyModule
-__all__ = ['FeedlyBackend']
+__all__ = ['FeedlyModule']
diff --git a/modules/feedly/backend.py b/modules/feedly/backend.py
index 267ac5edb323394721ff242e37e72d0cdcbf99f5..08a037c672fb1162051300b5cbd17909effb1c6d 100644
--- a/modules/feedly/backend.py
+++ b/modules/feedly/backend.py
@@ -26,10 +26,10 @@
from .browser import FeedlyBrowser
from .google import GoogleBrowser
-__all__ = ['FeedlyBackend']
+__all__ = ['FeedlyModule']
-class FeedlyBackend(BaseModule, CapMessages, CapCollection):
+class FeedlyModule(BaseModule, CapMessages, CapCollection):
NAME = 'feedly'
DESCRIPTION = u'handle the popular RSS reading service Feedly'
MAINTAINER = u'Bezleputh'
diff --git a/modules/fortuneo/__init__.py b/modules/fortuneo/__init__.py
index 9390277f29ec159b39a7cd709fcb4b0acc28d9fb..46c0f8226bcc412c02d1d292163ba374d4836372 100644
--- a/modules/fortuneo/__init__.py
+++ b/modules/fortuneo/__init__.py
@@ -18,8 +18,8 @@
# along with weboob. If not, see .
-from .backend import FortuneoBackend
+from .backend import FortuneoModule
-__all__ = ['FortuneoBackend']
+__all__ = ['FortuneoModule']
# vim:ts=4:sw=4
diff --git a/modules/fortuneo/backend.py b/modules/fortuneo/backend.py
index dc193476d5210fb6129468a31bc3cfb296910c21..8700180038d97424faef2f44c3f6730c55a0c46d 100644
--- a/modules/fortuneo/backend.py
+++ b/modules/fortuneo/backend.py
@@ -25,10 +25,10 @@
from .browser import Fortuneo
-__all__ = ['FortuneoBackend']
+__all__ = ['FortuneoModule']
-class FortuneoBackend(BaseModule, CapBank):
+class FortuneoModule(BaseModule, CapBank):
NAME = 'fortuneo'
MAINTAINER = u'Gilles-Alexandre Quenot'
EMAIL = 'gilles.quenot@gmail.com'
diff --git a/modules/fourchan/__init__.py b/modules/fourchan/__init__.py
index 29b470fccbaa1ab6b8ae443cd7443b0a8b11e4c5..6b8a0e67e1db57c14e3dbad248d5d13a991b0a3d 100644
--- a/modules/fourchan/__init__.py
+++ b/modules/fourchan/__init__.py
@@ -1,4 +1,4 @@
-from .backend import FourChanBackend
+from .backend import FourChanModule
from .browser import FourChan
-__all__ = ['FourChanBackend', 'FourChan']
+__all__ = ['FourChanModule', 'FourChan']
diff --git a/modules/fourchan/backend.py b/modules/fourchan/backend.py
index cd90065535b929a4bb5fe16ae781fdbb6ae90cd6..f664f0f795a6be64033e2f73ccfd0ce7239683ab 100644
--- a/modules/fourchan/backend.py
+++ b/modules/fourchan/backend.py
@@ -27,10 +27,10 @@
from .browser import FourChan
-__all__ = ['FourChanBackend']
+__all__ = ['FourChanModule']
-class FourChanBackend(BaseModule, CapMessages):
+class FourChanModule(BaseModule, CapMessages):
NAME = 'fourchan'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/francetelevisions/__init__.py b/modules/francetelevisions/__init__.py
index 0f3631d455e6c5ec8dd0ebf173ccbe22ced81ded..e66b7063238412206cb623bc0cf69f06e4b478ec 100644
--- a/modules/francetelevisions/__init__.py
+++ b/modules/francetelevisions/__init__.py
@@ -1,3 +1,3 @@
-from .backend import PluzzBackend
+from .backend import PluzzModule
-__all__ = ['PluzzBackend']
+__all__ = ['PluzzModule']
diff --git a/modules/francetelevisions/backend.py b/modules/francetelevisions/backend.py
index 1d8633a6cb1d3a0ac694da390f0487d19ab9f555..ce1efa5cdd54125be187fc134bbabe116ca2db6c 100644
--- a/modules/francetelevisions/backend.py
+++ b/modules/francetelevisions/backend.py
@@ -25,10 +25,10 @@
from .browser import PluzzBrowser
-__all__ = ['PluzzBackend']
+__all__ = ['PluzzModule']
-class PluzzBackend(BaseModule, CapVideo, CapCollection):
+class PluzzModule(BaseModule, CapVideo, CapCollection):
NAME = 'francetelevisions'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/freemobile/__init__.py b/modules/freemobile/__init__.py
index 4bc4fd9f33cb6208668bc75675f3db627ef2e679..758e72ef17678dd700d6402fb7408efa4bad58fe 100644
--- a/modules/freemobile/__init__.py
+++ b/modules/freemobile/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import FreeMobileBackend
+from .backend import FreeMobileModule
-__all__ = ['FreeMobileBackend']
+__all__ = ['FreeMobileModule']
diff --git a/modules/freemobile/backend.py b/modules/freemobile/backend.py
index 8993578045c88cbe774a92f1a461d501f945dc76..e1c282ea1f37d26860872ed7315414c565111df6 100644
--- a/modules/freemobile/backend.py
+++ b/modules/freemobile/backend.py
@@ -25,10 +25,10 @@
from .browser import Freemobile
-__all__ = ['FreeMobileBackend']
+__all__ = ['FreeMobileModule']
-class FreeMobileBackend(BaseModule, CapBill):
+class FreeMobileModule(BaseModule, CapBill):
NAME = 'freemobile'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/ganassurances/__init__.py b/modules/ganassurances/__init__.py
index 44dacc94a13900cebb59929ff21e19cf77dcb97f..b736a4709b3cdcec76c77f8d38576a820fb7f628 100644
--- a/modules/ganassurances/__init__.py
+++ b/modules/ganassurances/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import GanAssurancesBackend
+from .backend import GanAssurancesModule
-__all__ = ['GanAssurancesBackend']
+__all__ = ['GanAssurancesModule']
diff --git a/modules/ganassurances/backend.py b/modules/ganassurances/backend.py
index 2e0331fe12d50c6de3b45f3bf738297e254d0040..ff01be40f6eb96fc66c7b523cab610bd6841e72c 100644
--- a/modules/ganassurances/backend.py
+++ b/modules/ganassurances/backend.py
@@ -26,10 +26,10 @@
from .browser import GanAssurances
-__all__ = ['GanAssurancesBackend']
+__all__ = ['GanAssurancesModule']
-class GanAssurancesBackend(BaseModule, CapBank):
+class GanAssurancesModule(BaseModule, CapBank):
NAME = 'ganassurances'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/gazelle/__init__.py b/modules/gazelle/__init__.py
index b3f0c068b4c63b9890d8c29d6facd703b5faccc6..74f85bea1d9e6168d94a87c0aa3766a32706f372 100644
--- a/modules/gazelle/__init__.py
+++ b/modules/gazelle/__init__.py
@@ -1,3 +1,3 @@
-from .backend import GazelleBackend
+from .backend import GazelleModule
-__all__ = ['GazelleBackend']
+__all__ = ['GazelleModule']
diff --git a/modules/gazelle/backend.py b/modules/gazelle/backend.py
index d6925c73fa4772038ca89718c521a31138f44527..9628cbe255c7f19b998b9b7dece81ec86f0aa893 100644
--- a/modules/gazelle/backend.py
+++ b/modules/gazelle/backend.py
@@ -24,10 +24,10 @@
from .browser import GazelleBrowser
-__all__ = ['GazelleBackend']
+__all__ = ['GazelleModule']
-class GazelleBackend(BaseModule, CapTorrent):
+class GazelleModule(BaseModule, CapTorrent):
NAME = 'gazelle'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/gdcvault/__init__.py b/modules/gdcvault/__init__.py
index c6833aff7ed8b37abf469f269a862372fde9b576..2030270b84b253b4ac4b6d938d490813dfaa8e07 100644
--- a/modules/gdcvault/__init__.py
+++ b/modules/gdcvault/__init__.py
@@ -1,3 +1,3 @@
-from .backend import GDCVaultBackend
+from .backend import GDCVaultModule
-__all__ = ['GDCVaultBackend']
+__all__ = ['GDCVaultModule']
diff --git a/modules/gdcvault/backend.py b/modules/gdcvault/backend.py
index ea232f33eed20a1c3d9437c4798864d7c55f8e0f..c78ed2c56f15f482f148e79533aec5f73a91b5a5 100644
--- a/modules/gdcvault/backend.py
+++ b/modules/gdcvault/backend.py
@@ -30,10 +30,10 @@
from .video import GDCVaultVideo
-__all__ = ['GDCVaultBackend']
+__all__ = ['GDCVaultModule']
-class GDCVaultBackend(BaseModule, CapVideo, CapCollection):
+class GDCVaultModule(BaseModule, CapVideo, CapCollection):
NAME = 'gdcvault'
MAINTAINER = u'François Revol'
EMAIL = 'revol@free.fr'
diff --git a/modules/gdfsuez/__init__.py b/modules/gdfsuez/__init__.py
index 392e99f0dd398e31d5a600ee68d109070c4e41a9..c7aa44f29ecd4d1d975b7189fa2e976812f80b79 100644
--- a/modules/gdfsuez/__init__.py
+++ b/modules/gdfsuez/__init__.py
@@ -1,3 +1,3 @@
-from .backend import GdfSuezBackend
+from .backend import GdfSuezModule
-__all__ = ['GdfSuezBackend']
+__all__ = ['GdfSuezModule']
diff --git a/modules/gdfsuez/backend.py b/modules/gdfsuez/backend.py
index 5283c91e4abe93afcd01c3d5e63387a915cf382d..7bfb2fb4f3c3d8f1399bc00cbf37ea636e87eef7 100644
--- a/modules/gdfsuez/backend.py
+++ b/modules/gdfsuez/backend.py
@@ -23,10 +23,10 @@
from weboob.tools.value import ValueBackendPassword
from .browser import GdfSuez
-__all__ = ['GdfSuezBackend']
+__all__ = ['GdfSuezModule']
-class GdfSuezBackend(BaseModule, CapBill):
+class GdfSuezModule(BaseModule, CapBill):
NAME = 'gdfsuez'
MAINTAINER = u'Mathieu Jourdan'
EMAIL = 'mathieu.jourdan@gresille.org'
diff --git a/modules/geolocip/__init__.py b/modules/geolocip/__init__.py
index c3fd9e200d04e1b1369c000258db147012a122f2..392a1438a63d439c3c1a8910938cf31055f36942 100644
--- a/modules/geolocip/__init__.py
+++ b/modules/geolocip/__init__.py
@@ -1,3 +1,3 @@
-from .backend import GeolocIpBackend
+from .backend import GeolocIpModule
-__all__ = ['GeolocIpBackend']
+__all__ = ['GeolocIpModule']
diff --git a/modules/geolocip/backend.py b/modules/geolocip/backend.py
index 557e0b7c4dffe82bad2b47c02d650faca9d8060a..be89460b997eea1e7d9e9a6b2f9d8689b414bdec 100644
--- a/modules/geolocip/backend.py
+++ b/modules/geolocip/backend.py
@@ -24,10 +24,10 @@
from weboob.tools.browser import BaseBrowser, BrowserUnavailable
-__all__ = ['GeolocIpBackend']
+__all__ = ['GeolocIpModule']
-class GeolocIpBackend(BaseModule, CapGeolocIp):
+class GeolocIpModule(BaseModule, CapGeolocIp):
NAME = 'geolocip'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/github/__init__.py b/modules/github/__init__.py
index 21b1de236630bb22f357d1b93cbd2474b0c3d71c..a9b203f8c8874103f18aeddf774021604267266b 100644
--- a/modules/github/__init__.py
+++ b/modules/github/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import GithubBackend
+from .backend import GithubModule
-__all__ = ['GithubBackend']
+__all__ = ['GithubModule']
diff --git a/modules/github/backend.py b/modules/github/backend.py
index 2f8ec2ddc90884d98daef06e139d7c91fbb0c524..6e4f8654c6625645050bd265a998d567fb7a9dc2 100644
--- a/modules/github/backend.py
+++ b/modules/github/backend.py
@@ -25,14 +25,14 @@
from .browser import GithubBrowser
-__all__ = ['GithubBackend']
+__all__ = ['GithubModule']
STATUSES = {'open': Status('open', u'Open', Status.VALUE_NEW),
'closed': Status('closed', u'closed', Status.VALUE_RESOLVED)}
# TODO tentatively parse github "labels"?
-class GithubBackend(BaseModule, CapBugTracker):
+class GithubModule(BaseModule, CapBugTracker):
NAME = 'github'
DESCRIPTION = u'GitHub issues tracking'
MAINTAINER = u'Vincent A'
diff --git a/modules/googletranslate/__init__.py b/modules/googletranslate/__init__.py
index 9d568e9d3b0f01a483ffac4720afb590ff0ae3c7..56cab3d728543b4a266aa81bedc8359d6da6e3d9 100644
--- a/modules/googletranslate/__init__.py
+++ b/modules/googletranslate/__init__.py
@@ -1,4 +1,4 @@
-"GoogleTranslateBackend init"
+"GoogleTranslateModule init"
# -*- coding: utf-8 -*-
# Copyright(C) 2012 Lucien Loiseau
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import GoogleTranslateBackend
+from .backend import GoogleTranslateModule
-__all__ = ['GoogleTranslateBackend']
+__all__ = ['GoogleTranslateModule']
diff --git a/modules/googletranslate/backend.py b/modules/googletranslate/backend.py
index 08ad399b6412e28ea9e9f1ec116dce54a02bbeb8..09efe4dd7b425f8563de714eff4e76774c8789c8 100644
--- a/modules/googletranslate/backend.py
+++ b/modules/googletranslate/backend.py
@@ -25,10 +25,10 @@
from .browser import GoogleTranslateBrowser
-__all__ = ['GoogleTranslateBackend']
+__all__ = ['GoogleTranslateModule']
-class GoogleTranslateBackend(BaseModule, CapTranslate):
+class GoogleTranslateModule(BaseModule, CapTranslate):
MAINTAINER = u'Lucien Loiseau'
EMAIL = 'loiseau.lucien@gmail.com'
VERSION = '1.0'
diff --git a/modules/grooveshark/__init__.py b/modules/grooveshark/__init__.py
index f7ad83f533b181ace9f8522e7460067f98b7e7cf..bc510c357dbda33b6fe64b376f0edbf8eb84d960 100644
--- a/modules/grooveshark/__init__.py
+++ b/modules/grooveshark/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import GroovesharkBackend
+from .backend import GroovesharkModule
-__all__ = ['GroovesharkBackend']
+__all__ = ['GroovesharkModule']
diff --git a/modules/grooveshark/backend.py b/modules/grooveshark/backend.py
index 0397043b68ca107a60e2c9dd8a8294f16a9ffc02..339ca5363dbf81bd169d5b67eef2dc9c64048414 100644
--- a/modules/grooveshark/backend.py
+++ b/modules/grooveshark/backend.py
@@ -24,7 +24,7 @@
from .browser import GroovesharkBrowser
from weboob.tools.value import ValueBackendPassword, Value
-__all__ = ['GroovesharkBackend']
+__all__ = ['GroovesharkModule']
def cmp_id(p1, p2):
@@ -35,7 +35,7 @@ def cmp_id(p1, p2):
return -1
-class GroovesharkBackend(BaseModule, CapAudio, CapCollection):
+class GroovesharkModule(BaseModule, CapAudio, CapCollection):
NAME = 'grooveshark'
DESCRIPTION = u'Grooveshark music streaming website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/groupamaes/__init__.py b/modules/groupamaes/__init__.py
index 46414fd5cfba022b3a0cf86dc5ee526f194628b2..3ebfc5b874f036b013dc4e56233adbdede24455c 100644
--- a/modules/groupamaes/__init__.py
+++ b/modules/groupamaes/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import GroupamaesBackend
+from .backend import GroupamaesModule
-__all__ = ['GroupamaesBackend']
+__all__ = ['GroupamaesModule']
diff --git a/modules/groupamaes/backend.py b/modules/groupamaes/backend.py
index eff451f3309f891109525247e874b13dca741840..2e8ea4ea7a4a0397831ef37512fb0de5a4dd5ca1 100644
--- a/modules/groupamaes/backend.py
+++ b/modules/groupamaes/backend.py
@@ -25,10 +25,10 @@
from .browser import GroupamaesBrowser
-__all__ = ['GroupamaesBackend']
+__all__ = ['GroupamaesModule']
-class GroupamaesBackend(BaseModule, CapBank):
+class GroupamaesModule(BaseModule, CapBank):
NAME = 'groupamaes'
DESCRIPTION = u"Groupama Épargne Salariale"
MAINTAINER = u'Bezleputh'
diff --git a/modules/guerrillamail/__init__.py b/modules/guerrillamail/__init__.py
index 9b135b3aac373a3d4cda2058e733dc5facbf8a33..216911beb49bf1896f2e2cd74bef07fc0ed9c04a 100644
--- a/modules/guerrillamail/__init__.py
+++ b/modules/guerrillamail/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import GuerrillamailBackend
+from .backend import GuerrillamailModule
-__all__ = ['GuerrillamailBackend']
+__all__ = ['GuerrillamailModule']
diff --git a/modules/guerrillamail/backend.py b/modules/guerrillamail/backend.py
index ce8b32d83b743efc089d28d5f22be5e400544f5b..f8600d0685c3c55f346107ad9533baa962a570b0 100644
--- a/modules/guerrillamail/backend.py
+++ b/modules/guerrillamail/backend.py
@@ -25,10 +25,10 @@
from .browser import GuerrillamailBrowser
-__all__ = ['GuerrillamailBackend']
+__all__ = ['GuerrillamailModule']
-class GuerrillamailBackend(BaseModule, CapMessages, CapMessagesPost):
+class GuerrillamailModule(BaseModule, CapMessages, CapMessagesPost):
NAME = 'guerrillamail'
DESCRIPTION = u'GuerrillaMail temp mailbox'
MAINTAINER = u'Vincent A'
diff --git a/modules/hds/__init__.py b/modules/hds/__init__.py
index a7677ff1ce084833943d2ffdf1324fb6b6d4d342..6c86082cbe5bff6bc5dcdcd32eb0b0ab5adef38c 100644
--- a/modules/hds/__init__.py
+++ b/modules/hds/__init__.py
@@ -1,3 +1,3 @@
-from .backend import HDSBackend
+from .backend import HDSModule
-__all__ = ['HDSBackend']
+__all__ = ['HDSModule']
diff --git a/modules/hds/backend.py b/modules/hds/backend.py
index 754e66467112dbcf7a18237dd08eb72b4ecee86b..e6ffed3f0a254456797b65779e1bd2a22581c8a9 100644
--- a/modules/hds/backend.py
+++ b/modules/hds/backend.py
@@ -26,10 +26,10 @@
from .browser import HDSBrowser
-__all__ = ['HDSBackend']
+__all__ = ['HDSModule']
-class HDSBackend(BaseModule, CapMessages):
+class HDSModule(BaseModule, CapMessages):
NAME = 'hds'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/hellobank/__init__.py b/modules/hellobank/__init__.py
index 1bcadf0162901f12c1f87ad4f7437620e3654c79..a5b75b54e0cabc602c340fb14955fa839d08c106 100644
--- a/modules/hellobank/__init__.py
+++ b/modules/hellobank/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import HelloBankBackend
+from .backend import HelloBankModule
-__all__ = ['HelloBankBackend']
+__all__ = ['HelloBankModule']
diff --git a/modules/hellobank/backend.py b/modules/hellobank/backend.py
index 43b012637b8ba37855fca7c378d7e5f6d15a3ca8..992ff0dac12a95d0bbc87b8e4e21fff8d2fada2a 100644
--- a/modules/hellobank/backend.py
+++ b/modules/hellobank/backend.py
@@ -30,10 +30,10 @@
from .browser import HelloBank
-__all__ = ['HelloBankBackend']
+__all__ = ['HelloBankModule']
-class HelloBankBackend(BaseModule, CapBank, CapMessages):
+class HelloBankModule(BaseModule, CapBank, CapMessages):
NAME = 'hellobank'
MAINTAINER = u'Christophe Lampin'
EMAIL = 'weboob@lampin.net'
diff --git a/modules/hsbc/__init__.py b/modules/hsbc/__init__.py
index 55f11a53b33ff86539b8f5973f27aaf5cca5c566..e55f47dc02b3c64a4017cced1d41a2767a3b81ce 100644
--- a/modules/hsbc/__init__.py
+++ b/modules/hsbc/__init__.py
@@ -1,3 +1,3 @@
-from .backend import HSBCBackend
+from .backend import HSBCModule
-__all__ = ['HSBCBackend']
+__all__ = ['HSBCModule']
diff --git a/modules/hsbc/backend.py b/modules/hsbc/backend.py
index 2af4d8e1d2245a0baac859cfefe49c259087cc61..4367dce01cb54ad587be06f5f225c5de06dbf530 100644
--- a/modules/hsbc/backend.py
+++ b/modules/hsbc/backend.py
@@ -27,10 +27,10 @@
from .browser import HSBC
-__all__ = ['HSBCBackend']
+__all__ = ['HSBCModule']
-class HSBCBackend(BaseModule, CapBank):
+class HSBCModule(BaseModule, CapBank):
NAME = 'hsbc'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/hybride/__init__.py b/modules/hybride/__init__.py
index 07b8188eda005099177402ee32fbb9871993ec53..624ec1fa00cd4ba7888c4d895b6c15650cff88ed 100644
--- a/modules/hybride/__init__.py
+++ b/modules/hybride/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import HybrideBackend
+from .backend import HybrideModule
-__all__ = ['HybrideBackend']
+__all__ = ['HybrideModule']
diff --git a/modules/hybride/backend.py b/modules/hybride/backend.py
index ec1819e6bff075b5ca0920c32624e4d43b576b51..5a0f58530ed7cabed5249a63a718fc3c9ceea5d3 100644
--- a/modules/hybride/backend.py
+++ b/modules/hybride/backend.py
@@ -24,10 +24,10 @@
from .browser import HybrideBrowser
from .calendar import HybrideCalendarEvent
-__all__ = ['HybrideBackend']
+__all__ = ['HybrideModule']
-class HybrideBackend(BaseModule, CapCalendarEvent):
+class HybrideModule(BaseModule, CapCalendarEvent):
NAME = 'hybride'
DESCRIPTION = u'hybride website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/imdb/__init__.py b/modules/imdb/__init__.py
index d20b6ee1cd90f547a8b6a99938c720dce8250ad7..f83ead36a4dd1baa289cc1192dd9360be7ea157a 100644
--- a/modules/imdb/__init__.py
+++ b/modules/imdb/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import ImdbBackend
+from .backend import ImdbModule
-__all__ = ['ImdbBackend']
+__all__ = ['ImdbModule']
diff --git a/modules/imdb/backend.py b/modules/imdb/backend.py
index 2a5e634f7987c7fa458b5f9b09967bc65eddf52c..2f99f5e6c2c99d8777be48b8da9c50fe96e17fa3 100644
--- a/modules/imdb/backend.py
+++ b/modules/imdb/backend.py
@@ -24,10 +24,10 @@
from urllib import quote_plus
-__all__ = ['ImdbBackend']
+__all__ = ['ImdbModule']
-class ImdbBackend(BaseModule, CapCinema):
+class ImdbModule(BaseModule, CapCinema):
NAME = 'imdb'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/imgur/__init__.py b/modules/imgur/__init__.py
index 01915133e2fa880efa35f9930a9a3d068d9cec9e..cade61603763e1bbd46e03cea77323357b11012d 100644
--- a/modules/imgur/__init__.py
+++ b/modules/imgur/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import ImgurBackend
+from .backend import ImgurModule
-__all__ = ['ImgurBackend']
+__all__ = ['ImgurModule']
diff --git a/modules/imgur/backend.py b/modules/imgur/backend.py
index ec62c41c00a8768d9e26623447d3e1ff597414c3..982693726b2eb490512859cc7790234b518e3e60 100644
--- a/modules/imgur/backend.py
+++ b/modules/imgur/backend.py
@@ -27,7 +27,7 @@
import re
-__all__ = ['ImgurBackend']
+__all__ = ['ImgurModule']
class ImgPaste(BasePaste):
@@ -43,7 +43,7 @@ def raw_url(self):
return 'http://i.imgur.com/%s.png' % self.id
-class ImgurBackend(BaseModule, CapPaste):
+class ImgurModule(BaseModule, CapPaste):
NAME = 'imgur'
DESCRIPTION = u'imgur image upload service'
MAINTAINER = u'Vincent A'
diff --git a/modules/ina/__init__.py b/modules/ina/__init__.py
index f562b493b9fa9425ba4e582d91558c20a0768b21..bd3b57ae4a2a8640a9eba72d11bd33b43fc74f29 100644
--- a/modules/ina/__init__.py
+++ b/modules/ina/__init__.py
@@ -1,3 +1,3 @@
-from .backend import InaBackend
+from .backend import InaModule
-__all__ = ['InaBackend']
+__all__ = ['InaModule']
diff --git a/modules/ina/backend.py b/modules/ina/backend.py
index 6799350caa65c6812933d3c5a704188963f09c91..6d281e08b0a570b2cac0f769644a149f2ae8354c 100644
--- a/modules/ina/backend.py
+++ b/modules/ina/backend.py
@@ -25,10 +25,10 @@
from .video import InaVideo
-__all__ = ['InaBackend']
+__all__ = ['InaModule']
-class InaBackend(BaseModule, CapVideo):
+class InaModule(BaseModule, CapVideo):
NAME = 'ina'
MAINTAINER = u'Christophe Benz'
EMAIL = 'christophe.benz@gmail.com'
diff --git a/modules/indeed/__init__.py b/modules/indeed/__init__.py
index 038f349e8218076216b0dd9e31b39b7025c43bec..e49aee78411afd789f1743a903d4ca463090de68 100644
--- a/modules/indeed/__init__.py
+++ b/modules/indeed/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import IndeedBackend
+from .backend import IndeedModule
-__all__ = ['IndeedBackend']
+__all__ = ['IndeedModule']
diff --git a/modules/indeed/backend.py b/modules/indeed/backend.py
index b2f03f1a00367f490add9b40b11987040a262c60..9a89ffbf6e2562b4ab63fad7ef22e66e1a2541a6 100644
--- a/modules/indeed/backend.py
+++ b/modules/indeed/backend.py
@@ -24,10 +24,10 @@
from weboob.tools.value import Value
from .browser import IndeedBrowser
-__all__ = ['IndeedBackend']
+__all__ = ['IndeedModule']
-class IndeedBackend(BaseModule, CapJob):
+class IndeedModule(BaseModule, CapJob):
NAME = 'indeed'
DESCRIPTION = u'indeed website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/ing/__init__.py b/modules/ing/__init__.py
index 7bf141e7c52e5909dc7d98d5705e9b072df4be52..452c3ec0f0661a9dbd9a682a7b3c4a3ea79b0369 100644
--- a/modules/ing/__init__.py
+++ b/modules/ing/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import INGBackend
+from .backend import INGModule
-__all__ = ['INGBackend']
+__all__ = ['INGModule']
diff --git a/modules/ing/backend.py b/modules/ing/backend.py
index 3eeda0d21eb1e74a020e3f3f579bebac54d67ba5..5ec1f1cce5dff4bb100557c883e7304d5eddab43 100644
--- a/modules/ing/backend.py
+++ b/modules/ing/backend.py
@@ -28,10 +28,10 @@
from .browser import IngBrowser
-__all__ = ['INGBackend']
+__all__ = ['INGModule']
-class INGBackend(BaseModule, CapBank, CapBill):
+class INGModule(BaseModule, CapBank, CapBill):
NAME = 'ing'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/inrocks/__init__.py b/modules/inrocks/__init__.py
index ffad6e0a563112b0fb43aed005044aa6f9a9a682..2639451641acaf0b69099c65c7cf50ef25b0dda0 100644
--- a/modules/inrocks/__init__.py
+++ b/modules/inrocks/__init__.py
@@ -1,4 +1,4 @@
-"init of NewspaperInrocksBackend"
+"init of NewspaperInrocksModule"
# -*- coding: utf-8 -*-
# Copyright(C) 2011 Julien Hebert
@@ -18,6 +18,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import NewspaperInrocksBackend
+from .backend import NewspaperInrocksModule
-__all__ = ['NewspaperInrocksBackend']
+__all__ = ['NewspaperInrocksModule']
diff --git a/modules/inrocks/backend.py b/modules/inrocks/backend.py
index 51acb06b7bb059edf49811bb62896bd5c823d955..39a77d77fb6de8eee30f8a7b31135447a8a0b63b 100644
--- a/modules/inrocks/backend.py
+++ b/modules/inrocks/backend.py
@@ -19,12 +19,12 @@
"backend for http://www.lesinrocks.com"
from weboob.capabilities.messages import CapMessages
-from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
+from weboob.tools.capabilities.messages.GenericModule import GenericNewspaperModule
from .browser import NewspaperInrocksBrowser
from .tools import rssid
-class NewspaperInrocksBackend(GenericNewspaperBackend, CapMessages):
+class NewspaperInrocksModule(GenericNewspaperModule, CapMessages):
MAINTAINER = u'Julien Hebert'
EMAIL = 'juke@free.fr'
VERSION = '1.0'
diff --git a/modules/ipinfodb/__init__.py b/modules/ipinfodb/__init__.py
index ca5fee7a90b50de62ff0e06a81b778910cad39f5..4a7645eb05a54a254d2ff30852f4132afecf6905 100644
--- a/modules/ipinfodb/__init__.py
+++ b/modules/ipinfodb/__init__.py
@@ -1,3 +1,3 @@
-from .backend import IpinfodbBackend
+from .backend import IpinfodbModule
-__all__ = ['IpinfodbBackend']
+__all__ = ['IpinfodbModule']
diff --git a/modules/ipinfodb/backend.py b/modules/ipinfodb/backend.py
index ccc7b2ac4f9716be249245a7800fb712eb904107..4f7f624e3a5390b3ac4721d3908c0cdcf9d7eb4a 100644
--- a/modules/ipinfodb/backend.py
+++ b/modules/ipinfodb/backend.py
@@ -24,10 +24,10 @@
from weboob.tools.browser import StandardBrowser
-__all__ = ['IpinfodbBackend']
+__all__ = ['IpinfodbModule']
-class IpinfodbBackend(BaseModule, CapGeolocIp):
+class IpinfodbModule(BaseModule, CapGeolocIp):
NAME = 'ipinfodb'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/izneo/__init__.py b/modules/izneo/__init__.py
index fcb468a897f8d0b891126a14dfe591150cbdf15f..67cdf5abe4e2fdaa89e015f2407dc115107629a0 100644
--- a/modules/izneo/__init__.py
+++ b/modules/izneo/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import IzneoBackend
+from .backend import IzneoModule
-__all__ = ['IzneoBackend']
+__all__ = ['IzneoModule']
diff --git a/modules/izneo/backend.py b/modules/izneo/backend.py
index c9cc5f54b23ad5b2b075e7f2b254d29db8c3c774..42d587283420e7f8a7b395c8bba86a4ac5f064dd 100644
--- a/modules/izneo/backend.py
+++ b/modules/izneo/backend.py
@@ -26,7 +26,7 @@
from weboob.tools.backend import BaseModule
from weboob.tools.browser import BaseBrowser, BasePage
-__all__ = ['IzneoBackend']
+__all__ = ['IzneoModule']
class ReaderV2(BasePage):
@@ -61,7 +61,7 @@ def fill_image(self, image, fields):
image.url, None, {'Referer': image.gallery.url}))
-class IzneoBackend(BaseModule, CapGallery):
+class IzneoModule(BaseModule, CapGallery):
NAME = 'izneo'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
diff --git a/modules/jacquieetmichel/__init__.py b/modules/jacquieetmichel/__init__.py
index 88ea550b842b2792b85efb5a5920cf16e94c6eaa..23d9d34bcb5c5faf3cab485d68231f8863dbfa83 100644
--- a/modules/jacquieetmichel/__init__.py
+++ b/modules/jacquieetmichel/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import JacquieEtMichelBackend
+from .backend import JacquieEtMichelModule
-__all__ = ['JacquieEtMichelBackend']
+__all__ = ['JacquieEtMichelModule']
diff --git a/modules/jacquieetmichel/backend.py b/modules/jacquieetmichel/backend.py
index 5ffd170b54e26cd30d85a1bcbed743d0e479657b..d712b1cdbd5a6df0c661f71f1a83ac4bba29794a 100644
--- a/modules/jacquieetmichel/backend.py
+++ b/modules/jacquieetmichel/backend.py
@@ -25,10 +25,10 @@
from .video import JacquieEtMichelVideo
-__all__ = ['JacquieEtMichelBackend']
+__all__ = ['JacquieEtMichelModule']
-class JacquieEtMichelBackend(BaseModule, CapVideo, CapCollection):
+class JacquieEtMichelModule(BaseModule, CapVideo, CapCollection):
NAME = 'jacquieetmichel'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
diff --git a/modules/jcvelaux/__init__.py b/modules/jcvelaux/__init__.py
index 0552dc1f9c517fa64d48b417a9fe01aeed28b3ce..a535c5cbcc9b219726ddfae185b51de7f335fe86 100644
--- a/modules/jcvelaux/__init__.py
+++ b/modules/jcvelaux/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import jcvelauxBackend
+from .backend import jcvelauxModule
-__all__ = ['jcvelauxBackend']
+__all__ = ['jcvelauxModule']
diff --git a/modules/jcvelaux/backend.py b/modules/jcvelaux/backend.py
index 9e2c3d9aca4871fb7db6a26a82263b0ee0440eed..4bcbda260e9d6c0159864c71e20cd33b0a80fe68 100644
--- a/modules/jcvelaux/backend.py
+++ b/modules/jcvelaux/backend.py
@@ -27,7 +27,7 @@
from .browser import VelibBrowser
-__all__ = ['jcvelauxBackend']
+__all__ = ['jcvelauxModule']
SENSOR_TYPES = OrderedDict(((u'available_bikes', u'Available bikes'),
@@ -51,7 +51,7 @@ class BikeSensor(GaugeSensor):
latitude = StringField('Latitude of the sensor')
-class jcvelauxBackend(BaseModule, CapGauge):
+class jcvelauxModule(BaseModule, CapGauge):
NAME = 'jcvelaux'
DESCRIPTION = (u'City bike renting availability information.\nCities: %s' %
u', '.join(CITIES))
@@ -67,7 +67,7 @@ class jcvelauxBackend(BaseModule, CapGauge):
choices=CITIES + ("ALL",)))
def __init__(self, *a, **kw):
- super(jcvelauxBackend, self).__init__(*a, **kw)
+ super(jcvelauxModule, self).__init__(*a, **kw)
self.cities = None
def _make_gauge(self, info):
diff --git a/modules/jvmalin/__init__.py b/modules/jvmalin/__init__.py
index 87a9e5e5c1cb5c47223fbd15e11e2ebd808ab7af..c99915182503a0d05a15bba4af36fa7f63444c69 100644
--- a/modules/jvmalin/__init__.py
+++ b/modules/jvmalin/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import JVMalinBackend
+from .backend import JVMalinModule
-__all__ = ['JVMalinBackend']
+__all__ = ['JVMalinModule']
diff --git a/modules/jvmalin/backend.py b/modules/jvmalin/backend.py
index c09bd816e5031ddb9c0e4039ce54e14c8ee7a806..cf554a745dd29e914397d4e746027db6aa98073f 100644
--- a/modules/jvmalin/backend.py
+++ b/modules/jvmalin/backend.py
@@ -23,10 +23,10 @@
from .browser import JVMalin
-__all__ = ['JVMalinBackend']
+__all__ = ['JVMalinModule']
-class JVMalinBackend(BaseModule, CapTravel):
+class JVMalinModule(BaseModule, CapTravel):
NAME = 'jvmalin'
MAINTAINER = u'Alexandre Lissy'
EMAIL = 'github@lissy.me'
diff --git a/modules/kickass/__init__.py b/modules/kickass/__init__.py
index d26056035389d5256fbf3f8b52bb5d710385d7d0..acfac93f18de446ed5a744eb87ae6525b32eac0d 100644
--- a/modules/kickass/__init__.py
+++ b/modules/kickass/__init__.py
@@ -1,3 +1,3 @@
-from .backend import KickassBackend
+from .backend import KickassModule
-__all__ = ['KickassBackend']
+__all__ = ['KickassModule']
diff --git a/modules/kickass/backend.py b/modules/kickass/backend.py
index 06ae9fa41d5b15e010fe1ec75f6667114f71015c..80d7436fa1f29c86d7ca29137bbf8ca5e1e0a002 100644
--- a/modules/kickass/backend.py
+++ b/modules/kickass/backend.py
@@ -26,10 +26,10 @@
from contextlib import closing
from gzip import GzipFile
-__all__ = ['KickassBackend']
+__all__ = ['KickassModule']
-class KickassBackend(BaseModule, CapTorrent):
+class KickassModule(BaseModule, CapTorrent):
NAME = 'kickass'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/lacentrale/__init__.py b/modules/lacentrale/__init__.py
index a0da6f3ce1b1e7ebc3f2d4d490ac31098dddac16..37f3d12184a916ac69e335cf7286644c41777b96 100644
--- a/modules/lacentrale/__init__.py
+++ b/modules/lacentrale/__init__.py
@@ -1,3 +1,3 @@
-from .backend import LaCentraleBackend
+from .backend import LaCentraleModule
-__all__ = ['LaCentraleBackend']
+__all__ = ['LaCentraleModule']
diff --git a/modules/lacentrale/backend.py b/modules/lacentrale/backend.py
index 07e62a5e1244c748471c6cd066d3cd1ae7ba0ea4..41490df56c3e784f21d700e94ad75735f875e110 100644
--- a/modules/lacentrale/backend.py
+++ b/modules/lacentrale/backend.py
@@ -25,11 +25,11 @@
from .browser import LaCentraleBrowser
-__all__ = ['LaCentraleBackend']
+__all__ = ['LaCentraleModule']
# I implement capability
-class LaCentraleBackend(BaseModule, CapPriceComparison):
+class LaCentraleModule(BaseModule, CapPriceComparison):
NAME = 'lacentrale'
MAINTAINER = u'Vicnet'
EMAIL = 'vo.publique@gmail.com'
diff --git a/modules/lcl/__init__.py b/modules/lcl/__init__.py
index 0b2df93286a280c1a7977524aee0966157351efb..a89ad68cd1260e3656e761580edc27c2bf3d3440 100644
--- a/modules/lcl/__init__.py
+++ b/modules/lcl/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import LCLBackend
+from .backend import LCLModule
-__all__ = ['LCLBackend']
+__all__ = ['LCLModule']
diff --git a/modules/lcl/backend.py b/modules/lcl/backend.py
index 5b5816a9616e75bac67617e8f0d73a4bab857012..9455daae8dabe9eae892fb47ef9fa81e8c620194 100644
--- a/modules/lcl/backend.py
+++ b/modules/lcl/backend.py
@@ -28,10 +28,10 @@
from .enterprise.browser import LCLEnterpriseBrowser, LCLEspaceProBrowser
-__all__ = ['LCLBackend']
+__all__ = ['LCLModule']
-class LCLBackend(BaseModule, CapBank):
+class LCLModule(BaseModule, CapBank):
NAME = 'lcl'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/leclercmobile/__init__.py b/modules/leclercmobile/__init__.py
index 1138462d1e9caa4d724a50a92287dde876c903cb..79d1b72ef373f19ea360b3dc74e2370a2ace81f7 100644
--- a/modules/leclercmobile/__init__.py
+++ b/modules/leclercmobile/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import LeclercMobileBackend
+from .backend import LeclercMobileModule
-__all__ = ['LeclercMobileBackend']
+__all__ = ['LeclercMobileModule']
diff --git a/modules/leclercmobile/backend.py b/modules/leclercmobile/backend.py
index 7bd3e842f506e9cd04ae72f827d0d172c8f09cd4..a85f259c311ffa101f1ef6920730091b80368a7b 100644
--- a/modules/leclercmobile/backend.py
+++ b/modules/leclercmobile/backend.py
@@ -26,10 +26,10 @@
from .browser import Leclercmobile
-__all__ = ['LeclercMobileBackend']
+__all__ = ['LeclercMobileModule']
-class LeclercMobileBackend(BaseModule, CapBill):
+class LeclercMobileModule(BaseModule, CapBill):
NAME = 'leclercmobile'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/lefigaro/__init__.py b/modules/lefigaro/__init__.py
index 54481195a37864bb563f703d37d297c7e2379e07..e924a54d690a8754d27ec86086d611c08f3d5431 100644
--- a/modules/lefigaro/__init__.py
+++ b/modules/lefigaro/__init__.py
@@ -1,4 +1,4 @@
-"NewspaperFigaroBackend init"
+"NewspaperFigaroModule init"
# -*- coding: utf-8 -*-
# Copyright(C) 2011 Julien Hebert
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import NewspaperFigaroBackend
+from .backend import NewspaperFigaroModule
-__all__ = ['NewspaperFigaroBackend']
+__all__ = ['NewspaperFigaroModule']
diff --git a/modules/lefigaro/backend.py b/modules/lefigaro/backend.py
index fe3a4431af80df962f21443684b5380c5bbcdde2..62c396043f078e8b79a07939f52a5463e33643d0 100644
--- a/modules/lefigaro/backend.py
+++ b/modules/lefigaro/backend.py
@@ -19,12 +19,12 @@
"backend for http://www.lefigaro.fr"
from weboob.capabilities.messages import CapMessages
-from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
+from weboob.tools.capabilities.messages.GenericModule import GenericNewspaperModule
from .browser import NewspaperFigaroBrowser
from .tools import rssid
-class NewspaperFigaroBackend(GenericNewspaperBackend, CapMessages):
+class NewspaperFigaroModule(GenericNewspaperModule, CapMessages):
MAINTAINER = u'Julien Hebert'
EMAIL = 'juke@free.fr'
VERSION = '1.0'
diff --git a/modules/liberation/__init__.py b/modules/liberation/__init__.py
index 13df3695f3cb9f08dbf93daca4dad50a11010c83..9a0556672959454248378b5ee53873a7933ffd3a 100644
--- a/modules/liberation/__init__.py
+++ b/modules/liberation/__init__.py
@@ -1,4 +1,4 @@
-"NewspaperLibeBackend init"
+"NewspaperLibeModule init"
# -*- coding: utf-8 -*-
# Copyright(C) 2013 Florent Fourcot
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import NewspaperLibeBackend
+from .backend import NewspaperLibeModule
-__all__ = ['NewspaperLibeBackend']
+__all__ = ['NewspaperLibeModule']
diff --git a/modules/liberation/backend.py b/modules/liberation/backend.py
index e8051b255aed514b55bc5c42e17b3d56780ee93a..497fcc6055a23ede92cdd22d24169de936de998a 100644
--- a/modules/liberation/backend.py
+++ b/modules/liberation/backend.py
@@ -20,14 +20,14 @@
from weboob.tools.newsfeed import Newsfeed
from weboob.capabilities.messages import CapMessages, Thread
-from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
+from weboob.tools.capabilities.messages.GenericModule import GenericNewspaperModule
from weboob.tools.backend import BackendConfig
from weboob.tools.value import Value
from .browser import NewspaperLibeBrowser
from .tools import rssid, url2id
-class NewspaperLibeBackend(GenericNewspaperBackend, CapMessages):
+class NewspaperLibeModule(GenericNewspaperModule, CapMessages):
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
VERSION = '1.0'
@@ -56,7 +56,7 @@ class NewspaperLibeBackend(GenericNewspaperBackend, CapMessages):
))
def __init__(self, *args, **kwargs):
- GenericNewspaperBackend.__init__(self, *args, **kwargs)
+ GenericNewspaperModule.__init__(self, *args, **kwargs)
self.RSS_FEED = "http://www.liberation.fr/rss/%s" % self.config['feed'].get()
def iter_threads(self):
diff --git a/modules/lolix/__init__.py b/modules/lolix/__init__.py
index d027c5d85007a2ac2e4d54af2964d75251a90c92..bd625ed0959a1cd88c41a657b28823e76118777d 100644
--- a/modules/lolix/__init__.py
+++ b/modules/lolix/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import LolixBackend
+from .backend import LolixModule
-__all__ = ['LolixBackend']
+__all__ = ['LolixModule']
diff --git a/modules/lolix/backend.py b/modules/lolix/backend.py
index 36ae57038a8ac97f2c9504f9b5c6b258722d532c..f08ccb44dff9160789817f4b72588f3bf52d0ea1 100644
--- a/modules/lolix/backend.py
+++ b/modules/lolix/backend.py
@@ -25,10 +25,10 @@
from .browser import LolixBrowser
from .job import LolixJobAdvert
-__all__ = ['LolixBackend']
+__all__ = ['LolixModule']
-class LolixBackend(BaseModule, CapJob):
+class LolixModule(BaseModule, CapJob):
NAME = 'lolix'
DESCRIPTION = u'Lolix French free software employment website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/lutim/__init__.py b/modules/lutim/__init__.py
index 83a0f1b93f0b0cd61c65ad9eb14d113031219161..620b41699f2da43a95e361ebeeb45e7e2ef978e8 100644
--- a/modules/lutim/__init__.py
+++ b/modules/lutim/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import LutimBackend
+from .backend import LutimModule
-__all__ = ['LutimBackend']
+__all__ = ['LutimModule']
diff --git a/modules/lutim/backend.py b/modules/lutim/backend.py
index 998e769c0c94c999394faf1c103083db6a713692..cc91f5e75ee27979d0de2ce14516dc41a36e0adf 100644
--- a/modules/lutim/backend.py
+++ b/modules/lutim/backend.py
@@ -28,10 +28,10 @@
from .browser import LutimBrowser
-__all__ = ['LutimBackend']
+__all__ = ['LutimModule']
-class LutimBackend(BaseModule, CapPaste):
+class LutimModule(BaseModule, CapPaste):
NAME = 'lutim'
DESCRIPTION = u'LUTIm website'
MAINTAINER = u'Vincent A'
diff --git a/modules/mailinator/__init__.py b/modules/mailinator/__init__.py
index 1c40f994914aba9216e932869e3ff5ee613c3b79..b2c9b79b58778a744591aeb28a1ae58c425f5790 100644
--- a/modules/mailinator/__init__.py
+++ b/modules/mailinator/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import MailinatorBackend
+from .backend import MailinatorModule
-__all__ = ['MailinatorBackend']
+__all__ = ['MailinatorModule']
diff --git a/modules/mailinator/backend.py b/modules/mailinator/backend.py
index 1a2cad66bac788ddcf681e8b83d2e3a858e5a8e7..f42230262a1dff45209c73568e1c156f2d89e832 100644
--- a/modules/mailinator/backend.py
+++ b/modules/mailinator/backend.py
@@ -25,12 +25,12 @@
from .browser import MailinatorBrowser
-__all__ = ['MailinatorBackend']
+__all__ = ['MailinatorModule']
# 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(BaseModule, CapMessages):
+class MailinatorModule(BaseModule, CapMessages):
NAME = 'mailinator'
DESCRIPTION = u'mailinator temp mailbox'
MAINTAINER = u'Vincent A'
diff --git a/modules/mangafox/__init__.py b/modules/mangafox/__init__.py
index 38e25f9e517f32564ab9e77d7b8c8e83f392aa48..43bb10ba736ab6fab8f5f63c2a04962232b75646 100644
--- a/modules/mangafox/__init__.py
+++ b/modules/mangafox/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import MangafoxBackend
+from .backend import MangafoxModule
-__all__ = ['MangafoxBackend']
+__all__ = ['MangafoxModule']
diff --git a/modules/mangafox/backend.py b/modules/mangafox/backend.py
index e10ae6a5c7ae6950bd21adedb1c7c59fb470bbc0..0d567a649c939d7efd3e15edadf31ada32951937 100644
--- a/modules/mangafox/backend.py
+++ b/modules/mangafox/backend.py
@@ -17,12 +17,12 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderBackend, DisplayPage
+from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderModule, DisplayPage
-__all__ = ['MangafoxBackend']
+__all__ = ['MangafoxModule']
-class MangafoxBackend(GenericComicReaderBackend):
+class MangafoxModule(GenericComicReaderModule):
NAME = 'mangafox'
DESCRIPTION = 'Manga Fox manga reading website'
BROWSER_PARAMS = dict(
diff --git a/modules/mangago/__init__.py b/modules/mangago/__init__.py
index 171bfe1879c2561951daa424fc9346e5b66cd42f..afd07b77fc98a68838f719510e258f0ee4206b66 100644
--- a/modules/mangago/__init__.py
+++ b/modules/mangago/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import MangagoBackend
+from .backend import MangagoModule
-__all__ = ['MangagoBackend']
+__all__ = ['MangagoModule']
diff --git a/modules/mangago/backend.py b/modules/mangago/backend.py
index aa191b5194bec5b5b823314f116b8334262f0ab8..7bbab0c5ac949928828993d906a132ad1cb6fe46 100644
--- a/modules/mangago/backend.py
+++ b/modules/mangago/backend.py
@@ -18,12 +18,12 @@
# along with weboob. If not, see .
-from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderBackend, DisplayPage
+from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderModule, DisplayPage
-__all__ = ['MangagoBackend']
+__all__ = ['MangagoModule']
-class MangagoBackend(GenericComicReaderBackend):
+class MangagoModule(GenericComicReaderModule):
NAME = 'mangago'
DESCRIPTION = 'Mangago manga reading site'
DOMAIN = 'www.mangago.com'
diff --git a/modules/mangahere/__init__.py b/modules/mangahere/__init__.py
index 6208f75998ee8adaabcf267c811e13f81e046443..7d9d18c2617509335ab3d49249c17367bc97faf9 100644
--- a/modules/mangahere/__init__.py
+++ b/modules/mangahere/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import MangahereBackend
+from .backend import MangahereModule
-__all__ = ['MangahereBackend']
+__all__ = ['MangahereModule']
diff --git a/modules/mangahere/backend.py b/modules/mangahere/backend.py
index 07d25c6d3b63fc11a45cc7f375b754c8a60f879b..a95474748a1ddd341fe2bbababad4e614df41501 100644
--- a/modules/mangahere/backend.py
+++ b/modules/mangahere/backend.py
@@ -17,12 +17,12 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderBackend, DisplayPage
+from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderModule, DisplayPage
-__all__ = ['MangahereBackend']
+__all__ = ['MangahereModule']
-class MangahereBackend(GenericComicReaderBackend):
+class MangahereModule(GenericComicReaderModule):
NAME = 'mangahere'
DESCRIPTION = 'Manga Here manga reading website'
DOMAIN = 'www.mangahere.com'
diff --git a/modules/mangareader/__init__.py b/modules/mangareader/__init__.py
index e2702ab159fc6ebcd52d1103936d7d60b29be4bb..262b78678f94f00003354f5a15af0bc0dbc64a1a 100644
--- a/modules/mangareader/__init__.py
+++ b/modules/mangareader/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import MangareaderBackend
+from .backend import MangareaderModule
-__all__ = ['MangareaderBackend']
+__all__ = ['MangareaderModule']
diff --git a/modules/mangareader/backend.py b/modules/mangareader/backend.py
index ddba6dd8a3f3a2d841cdb80a5ca345992e87c7c1..da1b5afd763947fd54dcb87ae618fe1961d4f78b 100644
--- a/modules/mangareader/backend.py
+++ b/modules/mangareader/backend.py
@@ -17,13 +17,13 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderBackend, DisplayPage
+from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderModule, DisplayPage
-__all__ = ['MangareaderBackend']
+__all__ = ['MangareaderModule']
-class MangareaderBackend(GenericComicReaderBackend):
+class MangareaderModule(GenericComicReaderModule):
NAME = 'mangareader'
DESCRIPTION = 'MangaReader manga reading website'
DOMAIN = 'www.mangareader.net'
diff --git a/modules/mareeinfo/__init__.py b/modules/mareeinfo/__init__.py
index 0588edee9613dd764d3dd66b9d02ed39a7c07ccf..b934a3553d138843b96f9578da17ae49d6259878 100644
--- a/modules/mareeinfo/__init__.py
+++ b/modules/mareeinfo/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import MareeinfoBackend
+from .backend import MareeinfoModule
-__all__ = ['MareeinfoBackend']
+__all__ = ['MareeinfoModule']
diff --git a/modules/mareeinfo/backend.py b/modules/mareeinfo/backend.py
index 0754d8e33a9a54432f91aa4fa8280610c72172d9..e29dddc4f0e28b9d6ebf43786e05f4f64e459823 100644
--- a/modules/mareeinfo/backend.py
+++ b/modules/mareeinfo/backend.py
@@ -24,10 +24,10 @@
from .browser import MareeinfoBrowser
-__all__ = ['MareeinfoBackend']
+__all__ = ['MareeinfoModule']
-class MareeinfoBackend(BaseModule, CapGauge):
+class MareeinfoModule(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/__init__.py b/modules/marmiton/__init__.py
index 713a4d9261998822fe561506490d1e11c18caafb..343e2efa38170efcb6b59fd667f2d688ca12ae8f 100644
--- a/modules/marmiton/__init__.py
+++ b/modules/marmiton/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import MarmitonBackend
+from .backend import MarmitonModule
-__all__ = ['MarmitonBackend']
+__all__ = ['MarmitonModule']
diff --git a/modules/marmiton/backend.py b/modules/marmiton/backend.py
index 572d1e5971cd23da7b9957d350d6361890e69c65..98ad24fd118ead3f5828e8845921358c13804eba 100644
--- a/modules/marmiton/backend.py
+++ b/modules/marmiton/backend.py
@@ -24,10 +24,10 @@
from urllib import quote_plus
-__all__ = ['MarmitonBackend']
+__all__ = ['MarmitonModule']
-class MarmitonBackend(BaseModule, CapRecipe):
+class MarmitonModule(BaseModule, CapRecipe):
NAME = 'marmiton'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/mediawiki/__init__.py b/modules/mediawiki/__init__.py
index cc66cfdec51309802de390d53ab8a2293a9a74c2..dbd8a1ef23ce2216a88ac339bcc1c4c2fb6d463b 100644
--- a/modules/mediawiki/__init__.py
+++ b/modules/mediawiki/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import MediawikiBackend
+from .backend import MediawikiModule
-__all__ = ['MediawikiBackend']
+__all__ = ['MediawikiModule']
diff --git a/modules/mediawiki/backend.py b/modules/mediawiki/backend.py
index edf20714fb934a900b0335c873e3a10994c5cdd4..be2bcd2e99f600e49c555b0b24ea17377fef351e 100644
--- a/modules/mediawiki/backend.py
+++ b/modules/mediawiki/backend.py
@@ -27,10 +27,10 @@
from .browser import MediawikiBrowser
-__all__ = ['MediawikiBackend']
+__all__ = ['MediawikiModule']
-class MediawikiBackend(BaseModule, CapContent):
+class MediawikiModule(BaseModule, CapContent):
NAME = 'mediawiki'
MAINTAINER = u'Clément Schreiner'
EMAIL = 'clemux@clemux.info'
diff --git a/modules/meteofrance/__init__.py b/modules/meteofrance/__init__.py
index 29b97054278e795279b04ea89194aa8f1d99e2b2..01fb43f72145a13a617d43c6fcbaaf5dd74be8ae 100644
--- a/modules/meteofrance/__init__.py
+++ b/modules/meteofrance/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import MeteofranceBackend
+from .backend import MeteofranceModule
-__all__ = ['MeteofranceBackend']
+__all__ = ['MeteofranceModule']
diff --git a/modules/meteofrance/backend.py b/modules/meteofrance/backend.py
index 1a5b5522ad49bcc986d741adf7e35726c65a36cb..9aa387638300d0ee2ec03af070efc06b1d03fabd 100644
--- a/modules/meteofrance/backend.py
+++ b/modules/meteofrance/backend.py
@@ -24,10 +24,10 @@
from .browser import MeteofranceBrowser
-__all__ = ['MeteofranceBackend']
+__all__ = ['MeteofranceModule']
-class MeteofranceBackend(BaseModule, CapWeather):
+class MeteofranceModule(BaseModule, CapWeather):
NAME = 'meteofrance'
MAINTAINER = u'Cedric Defortis'
EMAIL = 'cedric@aiur.fr'
diff --git a/modules/minutes20/__init__.py b/modules/minutes20/__init__.py
index 185a333a702a0b90dfac09f4c5da1a035592b41c..c9ef026de9e580410f0e53df91601c733564447d 100644
--- a/modules/minutes20/__init__.py
+++ b/modules/minutes20/__init__.py
@@ -1,4 +1,4 @@
-"init of Newspaper20minutesBackend"
+"init of Newspaper20minutesModule"
# -*- coding: utf-8 -*-
# Copyright(C) 2011 Julien Hebert
@@ -18,5 +18,5 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import Newspaper20minutesBackend
-__all__ = ['Newspaper20minutesBackend']
+from .backend import Newspaper20minutesModule
+__all__ = ['Newspaper20minutesModule']
diff --git a/modules/minutes20/backend.py b/modules/minutes20/backend.py
index 7a3c91f5542642a569c689706ce42495ad6850d2..8b1cacf9b722e6878856d73928bd9cda8740b088 100644
--- a/modules/minutes20/backend.py
+++ b/modules/minutes20/backend.py
@@ -19,12 +19,12 @@
"backend for http://20minutes.fr"
from weboob.capabilities.messages import CapMessages
-from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
+from weboob.tools.capabilities.messages.GenericModule import GenericNewspaperModule
from .browser import Newspaper20minutesBrowser
from .tools import rssid
-class Newspaper20minutesBackend(GenericNewspaperBackend, CapMessages):
+class Newspaper20minutesModule(GenericNewspaperModule, CapMessages):
MAINTAINER = u'Julien Hebert'
EMAIL = 'juke@free.fr'
VERSION = '1.0'
diff --git a/modules/monster/__init__.py b/modules/monster/__init__.py
index ca0a467bc43e7a6118626ebadcc625c8ac39247d..ebd87522ff12a954cfdb742bcabd5c56c23435e4 100644
--- a/modules/monster/__init__.py
+++ b/modules/monster/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import MonsterBackend
+from .backend import MonsterModule
-__all__ = ['MonsterBackend']
+__all__ = ['MonsterModule']
diff --git a/modules/monster/backend.py b/modules/monster/backend.py
index ca1a3b5b5354c62bf8281e93abbd0a3c8794806d..566d3137703cdd0160eb5bbb87fdaebfe8a3bd1d 100644
--- a/modules/monster/backend.py
+++ b/modules/monster/backend.py
@@ -26,10 +26,10 @@
from .browser import MonsterBrowser
from .job import MonsterJobAdvert
-__all__ = ['MonsterBackend']
+__all__ = ['MonsterModule']
-class MonsterBackend(BaseModule, CapJob):
+class MonsterModule(BaseModule, CapJob):
NAME = 'monster'
DESCRIPTION = u'monster website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/nectarine/__init__.py b/modules/nectarine/__init__.py
index bfdb52b57a79d27b36ea5dad5b5119944953563f..35ab1db46009873d80d138bf66526f8c640fa7a1 100644
--- a/modules/nectarine/__init__.py
+++ b/modules/nectarine/__init__.py
@@ -1,3 +1,3 @@
-from .backend import NectarineBackend
+from .backend import NectarineModule
-__all__ = ['NectarineBackend']
+__all__ = ['NectarineModule']
diff --git a/modules/nectarine/backend.py b/modules/nectarine/backend.py
index b493864459196c5ada09b21e819d0c96aacaf82d..fb34c3f8acaca3f889d290b1bd94a820afd168c2 100644
--- a/modules/nectarine/backend.py
+++ b/modules/nectarine/backend.py
@@ -21,9 +21,9 @@
from weboob.tools.backend import BaseModule
from .browser import NectarineBrowser
-__all__ = ['NectarineBackend']
+__all__ = ['NectarineModule']
-class NectarineBackend(BaseModule, CapRadio, CapCollection):
+class NectarineModule(BaseModule, CapRadio, CapCollection):
NAME = 'nectarine'
MAINTAINER = u'Thomas Lecavelier'
EMAIL = 'thomas-weboob@lecavelier.name'
diff --git a/modules/nettokom/__init__.py b/modules/nettokom/__init__.py
index 7b713f054fb2039a65f76afde2ca6724a7c7329b..e08a9a0784134039df391c5a06ddd5051f2624f4 100644
--- a/modules/nettokom/__init__.py
+++ b/modules/nettokom/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import NettoKomBackend
+from .backend import NettoKomModule
-__all__ = ['NettoKomBackend']
+__all__ = ['NettoKomModule']
diff --git a/modules/nettokom/backend.py b/modules/nettokom/backend.py
index 4fb26edd5bb3c021dc2660708a9d827aa1d9ca19..55bab18a985d7d4ce29fbe5a6d77ac5ba2a4bad6 100644
--- a/modules/nettokom/backend.py
+++ b/modules/nettokom/backend.py
@@ -26,10 +26,10 @@
from .browser import Nettokom
-__all__ = ['NettoKomBackend']
+__all__ = ['NettoKomModule']
-class NettoKomBackend(BaseModule, CapBill):
+class NettoKomModule(BaseModule, CapBill):
NAME = 'nettokom'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/newsfeed/__init__.py b/modules/newsfeed/__init__.py
index a4be6843785df7828f58fc37fc6e4d8bff617634..90525c5cc2b47597e10d917d954d0fcff95008dc 100644
--- a/modules/newsfeed/__init__.py
+++ b/modules/newsfeed/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import NewsfeedBackend
+from .backend import NewsfeedModule
-__all__ = ['NewsfeedBackend']
+__all__ = ['NewsfeedModule']
diff --git a/modules/newsfeed/backend.py b/modules/newsfeed/backend.py
index 9563cfaaa71fa906d77a4476951b765e4033fe4d..43e5c6daca91ae2fe1ad09f05fb12cd3230213b1 100644
--- a/modules/newsfeed/backend.py
+++ b/modules/newsfeed/backend.py
@@ -24,10 +24,10 @@
from weboob.tools.value import Value
-__all__ = ['NewsfeedBackend']
+__all__ = ['NewsfeedModule']
-class NewsfeedBackend(BaseModule, CapMessages):
+class NewsfeedModule(BaseModule, CapMessages):
NAME = 'newsfeed'
MAINTAINER = u'Clément Schreiner'
EMAIL = "clemux@clemux.info"
diff --git a/modules/nihonnooto/__init__.py b/modules/nihonnooto/__init__.py
index 216f36ba59b8e13042130b2c335660dcaf11e9e9..56844a1390ea42903765f6d4a4781c101d85789a 100644
--- a/modules/nihonnooto/__init__.py
+++ b/modules/nihonnooto/__init__.py
@@ -1,3 +1,3 @@
-from .backend import NihonNoOtoBackend
+from .backend import NihonNoOtoModule
-__all__ = ['NihonNoOtoBackend']
+__all__ = ['NihonNoOtoModule']
diff --git a/modules/nihonnooto/backend.py b/modules/nihonnooto/backend.py
index 4fcc0bfed4ef2058e1996bdf499ad91c341cac68..32c3567332a74d43dc22131252a0dcc3ab08a0a7 100644
--- a/modules/nihonnooto/backend.py
+++ b/modules/nihonnooto/backend.py
@@ -21,9 +21,9 @@
from weboob.tools.backend import BaseModule
from .browser import NihonNoOtoBrowser
-__all__ = ['NihonNoOtoBackend']
+__all__ = ['NihonNoOtoModule']
-class NihonNoOtoBackend(BaseModule, CapRadio, CapCollection):
+class NihonNoOtoModule(BaseModule, CapRadio, CapCollection):
NAME = 'nihonnooto'
MAINTAINER = u'Thomas Lecavelier'
EMAIL = 'thomas-weboob@lecavelier.name'
diff --git a/modules/nolifetv/__init__.py b/modules/nolifetv/__init__.py
index 909ab782eb3f0f7d8ff18c1a609e1fe9ed6d0ceb..d39c244293b632d45bc0476a2687260a412e1c58 100644
--- a/modules/nolifetv/__init__.py
+++ b/modules/nolifetv/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import NolifeTVBackend
+from .backend import NolifeTVModule
-__all__ = ['NolifeTVBackend']
+__all__ = ['NolifeTVModule']
diff --git a/modules/nolifetv/backend.py b/modules/nolifetv/backend.py
index 525803d4a3fa9f4609c1860c5c925f831714a5bc..bf551d52b1f0653591884dbc8f52912f22a93791 100644
--- a/modules/nolifetv/backend.py
+++ b/modules/nolifetv/backend.py
@@ -29,9 +29,9 @@
import urllib, time
from hashlib import md5
-__all__ = ['NolifeTVBackend']
+__all__ = ['NolifeTVModule']
-class NolifeTVBackend(BaseModule, CapVideo, CapCollection):
+class NolifeTVModule(BaseModule, CapVideo, CapCollection):
NAME = 'nolifetv'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/nova/__init__.py b/modules/nova/__init__.py
index 05ea8c4c7bf2c87b656afaebf316115d9f72a2e8..33b43691d1bc5cb3d051b15476f512b258ec67b0 100644
--- a/modules/nova/__init__.py
+++ b/modules/nova/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import NovaBackend
+from .backend import NovaModule
-__all__ = ['NovaBackend']
+__all__ = ['NovaModule']
diff --git a/modules/nova/backend.py b/modules/nova/backend.py
index bf406ca54b022eb4e6dabd3b1b2fbe0a037fd887..b7a074471fc9695fc0ebfa2e5c3e797ce9258969 100644
--- a/modules/nova/backend.py
+++ b/modules/nova/backend.py
@@ -29,10 +29,10 @@
from weboob.tools.parsers import get_parser
-__all__ = ['NovaBackend']
+__all__ = ['NovaModule']
-class NovaBackend(BaseModule, CapRadio, CapCollection):
+class NovaModule(BaseModule, CapRadio, CapCollection):
NAME = 'nova'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/okc/__init__.py b/modules/okc/__init__.py
index 0ac88f3c13a01ae67a02c27d2592d5b4e0605fbe..23d0650e640e1155eee5b41a07a8e989b2639c00 100644
--- a/modules/okc/__init__.py
+++ b/modules/okc/__init__.py
@@ -19,6 +19,6 @@
from .browser import OkCBrowser
-from .backend import OkCBackend
+from .backend import OkCModule
-__all__ = ['OkCBrowser', 'OkCBackend']
+__all__ = ['OkCBrowser', 'OkCModule']
diff --git a/modules/okc/backend.py b/modules/okc/backend.py
index c867c2746755b690cf2e9136b55420086d9a234d..695ca7683bda727aadb34672f44e1d4aaa9de963 100644
--- a/modules/okc/backend.py
+++ b/modules/okc/backend.py
@@ -35,7 +35,7 @@
from .optim.profiles_walker import ProfilesWalker
-__all__ = ['OkCBackend']
+__all__ = ['OkCModule']
def parse_dt(s):
@@ -63,7 +63,7 @@ def parse_dt(s):
return local2utc(d)
-class OkCBackend(BaseModule, CapMessages, CapContact, CapMessagesPost, CapDating):
+class OkCModule(BaseModule, CapMessages, CapContact, CapMessagesPost, CapDating):
NAME = 'okc'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
diff --git a/modules/oney/__init__.py b/modules/oney/__init__.py
index 2404accec5cd2535397abb2853ee6776474da62d..36acc83ca79269e794dcb2780c7c37a357c2b39f 100644
--- a/modules/oney/__init__.py
+++ b/modules/oney/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import OneyBackend
+from .backend import OneyModule
-__all__ = ['OneyBackend']
+__all__ = ['OneyModule']
diff --git a/modules/oney/backend.py b/modules/oney/backend.py
index 3c6cc5a2845d97b4702bbc86312abf2e599b5fcc..e1c476cf19b8f48a88b88c693b959ab5d2e2cbae 100644
--- a/modules/oney/backend.py
+++ b/modules/oney/backend.py
@@ -27,10 +27,10 @@
from .browser import OneyBrowser
-__all__ = ['OneyBackend']
+__all__ = ['OneyModule']
-class OneyBackend(BaseModule, CapBank):
+class OneyModule(BaseModule, CapBank):
NAME = 'oney'
MAINTAINER = u'Vincet Paredes'
EMAIL = 'vparedes@budget-insight.com'
diff --git a/modules/opacwebaloes/__init__.py b/modules/opacwebaloes/__init__.py
index bb0ece21f8618a7ec4f649d9297ec4870646c117..fbf65e8d6222077dc6daeb7cd0a7f64bea9ec93a 100644
--- a/modules/opacwebaloes/__init__.py
+++ b/modules/opacwebaloes/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import AloesBackend
+from .backend import AloesModule
-__all__ = ['AloesBackend']
+__all__ = ['AloesModule']
diff --git a/modules/opacwebaloes/backend.py b/modules/opacwebaloes/backend.py
index 56b10c1c2b9dd32c22c0cacaec5fd555d5874a11..2e2924d0fd45d2fb322b4b126a9a0fdade2006c8 100644
--- a/modules/opacwebaloes/backend.py
+++ b/modules/opacwebaloes/backend.py
@@ -27,10 +27,10 @@
from .browser import AloesBrowser
-__all__ = ['AloesBackend']
+__all__ = ['AloesModule']
-class AloesBackend(BaseModule, CapBook):
+class AloesModule(BaseModule, CapBook):
NAME = 'opacwebaloes'
MAINTAINER = u'Jeremy Monnet'
EMAIL = 'jmonnet@gmail.com'
diff --git a/modules/opensubtitles/__init__.py b/modules/opensubtitles/__init__.py
index 0a58d64c184edae2936666e0eec32a48c4f05f03..c7092f762852fcca5ab9616f459747ebb259d0c4 100644
--- a/modules/opensubtitles/__init__.py
+++ b/modules/opensubtitles/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import OpensubtitlesBackend
+from .backend import OpensubtitlesModule
-__all__ = ['OpensubtitlesBackend']
+__all__ = ['OpensubtitlesModule']
diff --git a/modules/opensubtitles/backend.py b/modules/opensubtitles/backend.py
index a01896fe8e7590811f2ad6fa5f0ec1670df97531..5fe8938aa4c9c5e4de1fad9904d0710b5048bb82 100644
--- a/modules/opensubtitles/backend.py
+++ b/modules/opensubtitles/backend.py
@@ -25,10 +25,10 @@
from urllib import quote_plus
-__all__ = ['OpensubtitlesBackend']
+__all__ = ['OpensubtitlesModule']
-class OpensubtitlesBackend(BaseModule, CapSubtitle):
+class OpensubtitlesModule(BaseModule, CapSubtitle):
NAME = 'opensubtitles'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/orange/__init__.py b/modules/orange/__init__.py
index e958c83da49e61355e3f484306e408ff6232bad2..7040e06175bf61d732843b4c0b944b3d7d0ffa2b 100644
--- a/modules/orange/__init__.py
+++ b/modules/orange/__init__.py
@@ -1,3 +1,3 @@
-from .backend import OrangeBackend
+from .backend import OrangeModule
-__all__ = ['OrangeBackend']
+__all__ = ['OrangeModule']
diff --git a/modules/orange/backend.py b/modules/orange/backend.py
index f54ffb2e9ae2cd5e641ce26c0ca0c585242604e8..661b5e912bcbf820ffae1796429306f1ac85097e 100644
--- a/modules/orange/backend.py
+++ b/modules/orange/backend.py
@@ -28,10 +28,10 @@
from .browser import OrangeBrowser
-__all__ = ['OrangeBackend']
+__all__ = ['OrangeModule']
-class OrangeBackend(BaseModule, CapAccount, CapMessages, CapMessagesPost):
+class OrangeModule(BaseModule, CapAccount, CapMessages, CapMessagesPost):
NAME = 'orange'
MAINTAINER = u'Nicolas Duhamel'
EMAIL = 'nicolas@jombi.fr'
diff --git a/modules/ouifm/__init__.py b/modules/ouifm/__init__.py
index 8eabc1448fbaa69b0004525571c4f8263cbf7453..376d9f98b21323e6b7b1d363b55d866085cbcd40 100644
--- a/modules/ouifm/__init__.py
+++ b/modules/ouifm/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import OuiFMBackend
+from .backend import OuiFMModule
-__all__ = ['OuiFMBackend']
+__all__ = ['OuiFMModule']
diff --git a/modules/ouifm/backend.py b/modules/ouifm/backend.py
index 457f5bba5513c76757c1fae877c8057f73a4132a..b578d2edc33d3a6a93465e3b243cf31511cafaab 100644
--- a/modules/ouifm/backend.py
+++ b/modules/ouifm/backend.py
@@ -27,10 +27,10 @@
from weboob.tools.misc import to_unicode
-__all__ = ['OuiFMBackend']
+__all__ = ['OuiFMModule']
-class OuiFMBackend(BaseModule, CapRadio, CapCollection):
+class OuiFMModule(BaseModule, CapRadio, CapCollection):
NAME = 'ouifm'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/ovs/__init__.py b/modules/ovs/__init__.py
index fcbe95dcda3c48803b3400da414d946d4bc5f293..6a20439e3159b3eada6a18d9a4ffe0295bf2939c 100644
--- a/modules/ovs/__init__.py
+++ b/modules/ovs/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import OvsBackend
+from .backend import OvsModule
-__all__ = ['OvsBackend']
+__all__ = ['OvsModule']
diff --git a/modules/ovs/backend.py b/modules/ovs/backend.py
index e41f9e274c331a7c7632b0ce2f09aff0efff6194..d9de6ea1a7b747ec8eeb8f7946a764dc4f443d6a 100644
--- a/modules/ovs/backend.py
+++ b/modules/ovs/backend.py
@@ -26,7 +26,7 @@
from .browser import OvsBrowser
-__all__ = ['OvsBackend']
+__all__ = ['OvsModule']
CITIES = {u'agen': u'Agen', u'ajaccio': u'Ajaccio', u'albi': u'Albi', u'amiens': u'Amiens',
@@ -60,7 +60,7 @@
u'zurich': u'Zurich'}
-class OvsBackend(BaseModule, CapMessages, CapMessagesPost, CapContact):
+class OvsModule(BaseModule, CapMessages, CapMessagesPost, CapContact):
NAME = 'ovs'
DESCRIPTION = u'OnVaSortir website. Handles private messages only'
MAINTAINER = u'Vincent A'
diff --git a/modules/pap/__init__.py b/modules/pap/__init__.py
index 04880498a4cd8fe0f5585bfec5a251fc34f967e5..d1ef2e874eb75378871b3d82f891f352f69dd934 100644
--- a/modules/pap/__init__.py
+++ b/modules/pap/__init__.py
@@ -1,3 +1,3 @@
-from .backend import PapBackend
+from .backend import PapModule
-__all__ = ['PapBackend']
+__all__ = ['PapModule']
diff --git a/modules/pap/backend.py b/modules/pap/backend.py
index 719796f8b2d5661ddcf8b26e35e00ea59d1b8fe8..8772439529ac9f80a271f667a97659dfbbc200b5 100644
--- a/modules/pap/backend.py
+++ b/modules/pap/backend.py
@@ -25,10 +25,10 @@
from .browser import PapBrowser
-__all__ = ['PapBackend']
+__all__ = ['PapModule']
-class PapBackend(BaseModule, CapHousing):
+class PapModule(BaseModule, CapHousing):
NAME = 'pap'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/pariskiwi/__init__.py b/modules/pariskiwi/__init__.py
index f51a94b6599f90d636d62928c9a1ea3c2bce249d..356152651185baff47e1a5a104657938d663356a 100644
--- a/modules/pariskiwi/__init__.py
+++ b/modules/pariskiwi/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import ParisKiwiBackend
+from .backend import ParisKiwiModule
-__all__ = ['ParisKiwiBackend']
+__all__ = ['ParisKiwiModule']
diff --git a/modules/pariskiwi/backend.py b/modules/pariskiwi/backend.py
index d9c6c9402c88127f2c764a427e71ee1339733769..958eb6e07bd4ef811795b29a4f7a0220a54b4a55 100644
--- a/modules/pariskiwi/backend.py
+++ b/modules/pariskiwi/backend.py
@@ -25,10 +25,10 @@
from .browser import ParisKiwiBrowser
-__all__ = ['ParisKiwiBackend']
+__all__ = ['ParisKiwiModule']
-class ParisKiwiBackend(BaseModule, CapCalendarEvent):
+class ParisKiwiModule(BaseModule, CapCalendarEvent):
NAME = 'pariskiwi'
DESCRIPTION = u'ParisKiwi website'
MAINTAINER = u'Vincent A'
diff --git a/modules/parolesmania/__init__.py b/modules/parolesmania/__init__.py
index 46c9622e784757d42026c8d0fd325280b6bcca02..b7914ac93c70b0b852bd8b1d9d7f792c4f11a2b0 100644
--- a/modules/parolesmania/__init__.py
+++ b/modules/parolesmania/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import ParolesmaniaBackend
+from .backend import ParolesmaniaModule
-__all__ = ['ParolesmaniaBackend']
+__all__ = ['ParolesmaniaModule']
diff --git a/modules/parolesmania/backend.py b/modules/parolesmania/backend.py
index ee56535da47480532ca4231f20ec5e1ec6606c86..1d9ff4dd7d11848558b6a7ca046b1c400bcbb1c2 100644
--- a/modules/parolesmania/backend.py
+++ b/modules/parolesmania/backend.py
@@ -24,10 +24,10 @@
from urllib import quote_plus
-__all__ = ['ParolesmaniaBackend']
+__all__ = ['ParolesmaniaModule']
-class ParolesmaniaBackend(BaseModule, CapLyrics):
+class ParolesmaniaModule(BaseModule, CapLyrics):
NAME = 'parolesmania'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/parolesmusique/__init__.py b/modules/parolesmusique/__init__.py
index f4a6efb2fe58003c613caafa67111e5018df761c..39020064ef6628ef1d3d26da8c09366ff3ff5bf0 100644
--- a/modules/parolesmusique/__init__.py
+++ b/modules/parolesmusique/__init__.py
@@ -1,3 +1,3 @@
-from .backend import ParolesmusiqueBackend
+from .backend import ParolesmusiqueModule
-__all__ = ['ParolesmusiqueBackend']
+__all__ = ['ParolesmusiqueModule']
diff --git a/modules/parolesmusique/backend.py b/modules/parolesmusique/backend.py
index 3b0e369cc147e8f19b7f4c292dca20b576f3ecea..7ed7d7d6fcde05e762bf7e9f510867f98334ba3f 100644
--- a/modules/parolesmusique/backend.py
+++ b/modules/parolesmusique/backend.py
@@ -22,10 +22,10 @@
from .browser import ParolesmusiqueBrowser
-__all__ = ['ParolesmusiqueBackend']
+__all__ = ['ParolesmusiqueModule']
-class ParolesmusiqueBackend(BaseModule, CapLyrics):
+class ParolesmusiqueModule(BaseModule, CapLyrics):
NAME = 'parolesmusique'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/parolesnet/__init__.py b/modules/parolesnet/__init__.py
index ae4dd6ff57ebf90205087c4a21def99bcfbe012e..b83b750ca92d1eaac0106a93381824a76a15c8de 100644
--- a/modules/parolesnet/__init__.py
+++ b/modules/parolesnet/__init__.py
@@ -1,3 +1,3 @@
-from .backend import ParolesnetBackend
+from .backend import ParolesnetModule
-__all__ = ['ParolesnetBackend']
+__all__ = ['ParolesnetModule']
diff --git a/modules/parolesnet/backend.py b/modules/parolesnet/backend.py
index 18afa1233da985e2a4b749884b4c75a7049f004e..75a79bf07297cc2c90b03b201bf2663e30fe15fb 100644
--- a/modules/parolesnet/backend.py
+++ b/modules/parolesnet/backend.py
@@ -22,10 +22,10 @@
from .browser import ParolesnetBrowser
-__all__ = ['ParolesnetBackend']
+__all__ = ['ParolesnetModule']
-class ParolesnetBackend(BaseModule, CapLyrics):
+class ParolesnetModule(BaseModule, CapLyrics):
NAME = 'parolesnet'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/pastealacon/__init__.py b/modules/pastealacon/__init__.py
index 87a019912976ccb61220c5c6a07edea648844711..5a39afff6787ba0986f89795b17a523c41b07b41 100644
--- a/modules/pastealacon/__init__.py
+++ b/modules/pastealacon/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import PastealaconBackend
+from .backend import PastealaconModule
-__all__ = ['PastealaconBackend']
+__all__ = ['PastealaconModule']
diff --git a/modules/pastealacon/backend.py b/modules/pastealacon/backend.py
index 8c70fd23677e59a27aace280e1fd57cc25543e94..67a63d9333a8b1a175d425f960b8b1319edde178 100644
--- a/modules/pastealacon/backend.py
+++ b/modules/pastealacon/backend.py
@@ -20,14 +20,14 @@
import re
-from weboob.tools.capabilities.paste import BasePasteBackend
+from weboob.tools.capabilities.paste import BasePasteModule
from weboob.tools.backend import BaseModule
from weboob.capabilities.base import NotLoaded
from .browser import PastealaconBrowser, PastealaconPaste
-class PastealaconBackend(BaseModule, BasePasteBackend):
+class PastealaconModule(BaseModule, BasePasteModule):
NAME = 'pastealacon'
MAINTAINER = u'Laurent Bachelier'
EMAIL = 'laurent@bachelier.name'
diff --git a/modules/pastebin/__init__.py b/modules/pastebin/__init__.py
index 92f8d8623803690bd9cb5731db4817520ef7e87b..298da5fae4022232942f0d84f98d506ce2f337af 100644
--- a/modules/pastebin/__init__.py
+++ b/modules/pastebin/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import PastebinBackend
+from .backend import PastebinModule
-__all__ = ['PastebinBackend']
+__all__ = ['PastebinModule']
diff --git a/modules/pastebin/backend.py b/modules/pastebin/backend.py
index 0a39071b6f797f451e79606f253f696b49a83637..00b882e74830ef78397d68ad93c6ea403881bdd2 100644
--- a/modules/pastebin/backend.py
+++ b/modules/pastebin/backend.py
@@ -20,13 +20,13 @@
from weboob.capabilities.base import NotLoaded
from weboob.tools.backend import BackendConfig, BaseModule
-from weboob.tools.capabilities.paste import BasePasteBackend
+from weboob.tools.capabilities.paste import BasePasteModule
from weboob.tools.value import Value, ValueBackendPassword
from .browser import PastebinBrowser, PastebinPaste
-class PastebinBackend(BaseModule, BasePasteBackend):
+class PastebinModule(BaseModule, BasePasteModule):
NAME = 'pastebin'
MAINTAINER = u'Laurent Bachelier'
EMAIL = 'laurent@bachelier.name'
diff --git a/modules/paypal/__init__.py b/modules/paypal/__init__.py
index 3a773e7f7ec1385afc48773ca88400a0cbfe0d4d..83cd98022e073dfe18e7d5539052d58a2ba620b2 100644
--- a/modules/paypal/__init__.py
+++ b/modules/paypal/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import PaypalBackend
+from .backend import PaypalModule
-__all__ = ['PaypalBackend']
+__all__ = ['PaypalModule']
diff --git a/modules/paypal/backend.py b/modules/paypal/backend.py
index f5e45328ef2ec63ea13f7febaf428e2458c77f89..e23ebe1d1bc2e0cf7a2a64ca50e0dab2f3441a17 100644
--- a/modules/paypal/backend.py
+++ b/modules/paypal/backend.py
@@ -25,10 +25,10 @@
from .browser import Paypal
-__all__ = ['PaypalBackend']
+__all__ = ['PaypalModule']
-class PaypalBackend(BaseModule, CapBank):
+class PaypalModule(BaseModule, CapBank):
NAME = 'paypal'
MAINTAINER = u'Laurent Bachelier'
EMAIL = 'laurent@bachelier.name'
diff --git a/modules/phpbb/__init__.py b/modules/phpbb/__init__.py
index 28eefc07befcd3043dd4810de8848990bd5c8dce..71de346692b1d72c18ac07b1f623b709ed26566a 100644
--- a/modules/phpbb/__init__.py
+++ b/modules/phpbb/__init__.py
@@ -19,6 +19,6 @@
from .browser import PhpBB
-from .backend import PhpBBBackend
+from .backend import PhpBBModule
-__all__ = ['PhpBB', 'PhpBBBackend']
+__all__ = ['PhpBB', 'PhpBBModule']
diff --git a/modules/phpbb/backend.py b/modules/phpbb/backend.py
index 7f2c541cbc11d0ec960462504fcfba6ee4cb8b4c..1fafa8b62c6b7571661bd827ad71a4ebdc797168 100644
--- a/modules/phpbb/backend.py
+++ b/modules/phpbb/backend.py
@@ -30,10 +30,10 @@
from .tools import rssid, url2id, id2url, id2topic
-__all__ = ['PhpBBBackend']
+__all__ = ['PhpBBModule']
-class PhpBBBackend(BaseModule, CapMessages, CapMessagesPost):
+class PhpBBModule(BaseModule, CapMessages, CapMessagesPost):
NAME = 'phpbb'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/piratebay/__init__.py b/modules/piratebay/__init__.py
index 97955e8c7c6d3349522f1501cf521407a95c7973..ade346665a4e5ac5d02aab948c647167f6a0b83d 100644
--- a/modules/piratebay/__init__.py
+++ b/modules/piratebay/__init__.py
@@ -1,3 +1,3 @@
-from .backend import PiratebayBackend
+from .backend import PiratebayModule
-__all__ = ['PiratebayBackend']
+__all__ = ['PiratebayModule']
diff --git a/modules/piratebay/backend.py b/modules/piratebay/backend.py
index ffe7f7964a545d0b34670cf4b0ffa5b5760b48cb..f7feb778706ebae76db25beb5586577ef64b7ce1 100644
--- a/modules/piratebay/backend.py
+++ b/modules/piratebay/backend.py
@@ -25,10 +25,10 @@
from .browser import PiratebayBrowser
-__all__ = ['PiratebayBackend']
+__all__ = ['PiratebayModule']
-class PiratebayBackend(BaseModule, CapTorrent):
+class PiratebayModule(BaseModule, CapTorrent):
NAME = 'piratebay'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/pixtoilelibre/__init__.py b/modules/pixtoilelibre/__init__.py
index 60e84ad8816d9c0a24df9856e4b4c7a99ca68e95..a59fb491a63ac0ab66574692e29b54566b1db5af 100644
--- a/modules/pixtoilelibre/__init__.py
+++ b/modules/pixtoilelibre/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import PixtoilelibreBackend
+from .backend import PixtoilelibreModule
-__all__ = ['PixtoilelibreBackend']
+__all__ = ['PixtoilelibreModule']
diff --git a/modules/pixtoilelibre/backend.py b/modules/pixtoilelibre/backend.py
index 2605b1ef0226ce41aa9376b52ef6db4b74a96ce3..a388bfa34def908286217c739ff1f847b5a826b6 100644
--- a/modules/pixtoilelibre/backend.py
+++ b/modules/pixtoilelibre/backend.py
@@ -26,7 +26,7 @@
from .browser import PixtoilelibreBrowser
-__all__ = ['PixtoilelibreBackend']
+__all__ = ['PixtoilelibreModule']
class PixPaste(BasePaste):
@@ -35,7 +35,7 @@ def id2url(cls, id):
return 'http://pix.toile-libre.org/?img=%s' % id
-class PixtoilelibreBackend(BaseModule, CapPaste):
+class PixtoilelibreModule(BaseModule, CapPaste):
NAME = 'pixtoilelibre'
DESCRIPTION = u'toile-libre image hosting website'
MAINTAINER = u'Vincent A'
diff --git a/modules/podnapisi/__init__.py b/modules/podnapisi/__init__.py
index 313fff6306aef53f803bb448eac5af417e6095d2..dfe304301418f754cd0d681fde68c1e7a0e55a6f 100644
--- a/modules/podnapisi/__init__.py
+++ b/modules/podnapisi/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import PodnapisiBackend
+from .backend import PodnapisiModule
-__all__ = ['PodnapisiBackend']
+__all__ = ['PodnapisiModule']
diff --git a/modules/podnapisi/backend.py b/modules/podnapisi/backend.py
index 9ae6388e69b38bf843bd8b60079e4a2e73f5c3db..243cf5d4802b5de1d2f4f634bacd7881d615df53 100644
--- a/modules/podnapisi/backend.py
+++ b/modules/podnapisi/backend.py
@@ -25,10 +25,10 @@
from urllib import quote_plus
-__all__ = ['PodnapisiBackend']
+__all__ = ['PodnapisiModule']
-class PodnapisiBackend(BaseModule, CapSubtitle):
+class PodnapisiModule(BaseModule, CapSubtitle):
NAME = 'podnapisi'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/poivy/__init__.py b/modules/poivy/__init__.py
index ab467ddbbed57e623ed52aee39f79598e29450d7..a0ea86964b7192ca475fdffa390f37bee79990ad 100644
--- a/modules/poivy/__init__.py
+++ b/modules/poivy/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import PoivyBackend
+from .backend import PoivyModule
-__all__ = ['PoivyBackend']
+__all__ = ['PoivyModule']
diff --git a/modules/poivy/backend.py b/modules/poivy/backend.py
index 0eea0f30d09ce985a18a7c2ebfa1a193534921f0..84ce9bd767e3b1aebbaf04ae911157a85a3f1407 100644
--- a/modules/poivy/backend.py
+++ b/modules/poivy/backend.py
@@ -26,10 +26,10 @@
from .browser import PoivyBrowser
-__all__ = ['PoivyBackend']
+__all__ = ['PoivyModule']
-class PoivyBackend(BaseModule, CapBill):
+class PoivyModule(BaseModule, CapBill):
NAME = 'poivy'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/popolemploi/__init__.py b/modules/popolemploi/__init__.py
index 6188c94455472cdf1265b13298211f2fd2411269..04632066978d839bff4516fc304e92eaeb0b90da 100644
--- a/modules/popolemploi/__init__.py
+++ b/modules/popolemploi/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import PopolemploiBackend
+from .backend import PopolemploiModule
-__all__ = ['PopolemploiBackend']
+__all__ = ['PopolemploiModule']
diff --git a/modules/popolemploi/backend.py b/modules/popolemploi/backend.py
index 3dbeb98c40764b4d0c83a874dc7933bfe33ecfc0..3316161fc663038b1309e120210b97ec51ae38f8 100644
--- a/modules/popolemploi/backend.py
+++ b/modules/popolemploi/backend.py
@@ -26,10 +26,10 @@
from .browser import PopolemploiBrowser
from .job import PopolemploiJobAdvert
-__all__ = ['PopolemploiBackend']
+__all__ = ['PopolemploiModule']
-class PopolemploiBackend(BaseModule, CapJob):
+class PopolemploiModule(BaseModule, CapJob):
NAME = 'popolemploi'
DESCRIPTION = u'Pole Emploi website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/presseurop/__init__.py b/modules/presseurop/__init__.py
index 8851d44e4936e76cfd20a8cccf8343cfd4ab71ed..c4f1dcabe67a49989bb7421e2e7f5f1ef0fd120a 100644
--- a/modules/presseurop/__init__.py
+++ b/modules/presseurop/__init__.py
@@ -1,4 +1,4 @@
-"NewspaperPresseuropBackend init"
+"NewspaperPresseuropModule init"
# -*- coding: utf-8 -*-
# Copyright(C) 2012 Florent Fourcot
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import NewspaperPresseuropBackend
+from .backend import NewspaperPresseuropModule
-__all__ = ['NewspaperPresseuropBackend']
+__all__ = ['NewspaperPresseuropModule']
diff --git a/modules/presseurop/backend.py b/modules/presseurop/backend.py
index 8df2ead29ac88bf45a6a70649ea46e025309aa46..600abc225eb0a3c6534964abc76e2bebb9fb6e07 100644
--- a/modules/presseurop/backend.py
+++ b/modules/presseurop/backend.py
@@ -19,7 +19,7 @@
"backend for http://www.presseurop.eu"
from weboob.capabilities.messages import CapMessages, Thread
-from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
+from weboob.tools.capabilities.messages.GenericModule import GenericNewspaperModule
from weboob.tools.backend import BackendConfig
from weboob.tools.value import Value
from .browser import NewspaperPresseuropBrowser
@@ -27,7 +27,7 @@
from weboob.tools.newsfeed import Newsfeed
-class NewspaperPresseuropBackend(GenericNewspaperBackend, CapMessages):
+class NewspaperPresseuropModule(GenericNewspaperModule, CapMessages):
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
VERSION = '1.0'
@@ -46,7 +46,7 @@ class NewspaperPresseuropBackend(GenericNewspaperBackend, CapMessages):
default='fr'))
def __init__(self, *args, **kwargs):
- GenericNewspaperBackend.__init__(self, *args, **kwargs)
+ GenericNewspaperModule.__init__(self, *args, **kwargs)
self.RSS_FEED = 'http://www.voxeurop.eu/%s/rss.xml' % self.config['lang'].get()
def iter_threads(self):
diff --git a/modules/prixcarburants/__init__.py b/modules/prixcarburants/__init__.py
index 196accd363f70d6824f4b8c322cab731764be517..439eb567a1c1950f126bf407c1faf6259871520f 100644
--- a/modules/prixcarburants/__init__.py
+++ b/modules/prixcarburants/__init__.py
@@ -1,3 +1,3 @@
-from .backend import PrixCarburantsBackend
+from .backend import PrixCarburantsModule
-__all__ = ['PrixCarburantsBackend']
+__all__ = ['PrixCarburantsModule']
diff --git a/modules/prixcarburants/backend.py b/modules/prixcarburants/backend.py
index af8abe5b90267834c0a0136be03ecb6b3c679682..fd0e30210763b3fd8717b52ca8c10a1afb0def26 100644
--- a/modules/prixcarburants/backend.py
+++ b/modules/prixcarburants/backend.py
@@ -24,10 +24,10 @@
from .browser import PrixCarburantsBrowser
-__all__ = ['PrixCarburantsBackend']
+__all__ = ['PrixCarburantsModule']
-class PrixCarburantsBackend(BaseModule, CapPriceComparison):
+class PrixCarburantsModule(BaseModule, CapPriceComparison):
NAME = 'prixcarburants'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/quvi/__init__.py b/modules/quvi/__init__.py
index f4925f8c735ba4dbf4cf1f41f90fc4e9cee946ba..81abec0f805836e866c8485903116feb414e0a96 100644
--- a/modules/quvi/__init__.py
+++ b/modules/quvi/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import QuviBackend, QuviVideo
+from .backend import QuviModule, QuviVideo
-__all__ = ['QuviBackend', 'QuviVideo']
+__all__ = ['QuviModule', 'QuviVideo']
diff --git a/modules/quvi/backend.py b/modules/quvi/backend.py
index de400f564b15b019a43aa5a729fd95437dfc3421..61625ec1280592b6d291e66b5767c842555a2197 100644
--- a/modules/quvi/backend.py
+++ b/modules/quvi/backend.py
@@ -34,10 +34,10 @@
from quvi import LibQuvi, QuviError
-__all__ = ['QuviBackend', 'QuviVideo']
+__all__ = ['QuviModule', 'QuviVideo']
-class QuviBackend(BaseModule, CapVideo):
+class QuviModule(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/__init__.py b/modules/radiofrance/__init__.py
index f4f224dec266d06930955f908af2c2c546bc3320..ccd03e8bb8677d08ff9013f63082af09a57c5c6a 100644
--- a/modules/radiofrance/__init__.py
+++ b/modules/radiofrance/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import RadioFranceBackend
+from .backend import RadioFranceModule
-__all__ = ['RadioFranceBackend']
+__all__ = ['RadioFranceModule']
diff --git a/modules/radiofrance/backend.py b/modules/radiofrance/backend.py
index 0675caaaf9aa27e90bfbeee9b564513c7525e98d..143f29aec7eb678e035fda633b5813c832a19261 100644
--- a/modules/radiofrance/backend.py
+++ b/modules/radiofrance/backend.py
@@ -30,10 +30,10 @@
from .browser import RadioFranceBrowser, RadioFranceVideo
-__all__ = ['RadioFranceBackend']
+__all__ = ['RadioFranceModule']
-class RadioFranceBackend(BaseModule, CapRadio, CapCollection, CapVideo):
+class RadioFranceModule(BaseModule, CapRadio, CapCollection, CapVideo):
NAME = 'radiofrance'
MAINTAINER = u'Laurent Bachelier'
EMAIL = 'laurent@bachelier.name'
diff --git a/modules/razibus/__init__.py b/modules/razibus/__init__.py
index d3c9b3547367cbd8f9c5cad4ed849c0136a52254..0682c4410ccf01c635de17c23d793b8e58175e9c 100644
--- a/modules/razibus/__init__.py
+++ b/modules/razibus/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import RazibusBackend
+from .backend import RazibusModule
-__all__ = ['RazibusBackend']
+__all__ = ['RazibusModule']
diff --git a/modules/razibus/backend.py b/modules/razibus/backend.py
index ce82d56fadcc8a065a212b3421ef31fddd749a48..da8ba78f7706d53ff9b1871530905daedf208577 100644
--- a/modules/razibus/backend.py
+++ b/modules/razibus/backend.py
@@ -26,10 +26,10 @@
from .browser import RazibusBrowser
from .calendar import RazibusCalendarEvent
-__all__ = ['RazibusBackend']
+__all__ = ['RazibusModule']
-class RazibusBackend(BaseModule, CapCalendarEvent):
+class RazibusModule(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/__init__.py b/modules/redmine/__init__.py
index 8b72da373fd1d749f78986982373fd7549dc0ad7..0995717b5278b6777557e14fe8244f4a2088b84f 100644
--- a/modules/redmine/__init__.py
+++ b/modules/redmine/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import RedmineBackend
+from .backend import RedmineModule
-__all__ = ['RedmineBackend']
+__all__ = ['RedmineModule']
diff --git a/modules/redmine/backend.py b/modules/redmine/backend.py
index 1d5b46c3223a9b77af828a50791728dac89758ee..011ca0f12fd98332e56c240013c0a3484345db80 100644
--- a/modules/redmine/backend.py
+++ b/modules/redmine/backend.py
@@ -32,10 +32,10 @@
from .browser import RedmineBrowser
-__all__ = ['RedmineBackend']
+__all__ = ['RedmineModule']
-class RedmineBackend(BaseModule, CapContent, CapBugTracker, CapCollection):
+class RedmineModule(BaseModule, CapContent, CapBugTracker, CapCollection):
NAME = 'redmine'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/regionsjob/__init__.py b/modules/regionsjob/__init__.py
index e8dfa519ec0d3e899840ecea60c78d4fc7f044a8..96a88e060d833fe32c7a04c7fabbd5b08b606c67 100644
--- a/modules/regionsjob/__init__.py
+++ b/modules/regionsjob/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import RegionsjobBackend
+from .backend import RegionsjobModule
-__all__ = ['RegionsjobBackend']
+__all__ = ['RegionsjobModule']
diff --git a/modules/regionsjob/backend.py b/modules/regionsjob/backend.py
index 7a590047beeb0f940750bb212cb2cfdbe5637039..9977af36f6716a3c0447048ea461009629a84719 100644
--- a/modules/regionsjob/backend.py
+++ b/modules/regionsjob/backend.py
@@ -25,10 +25,10 @@
from weboob.tools.value import Value
-__all__ = ['RegionsjobBackend']
+__all__ = ['RegionsjobModule']
-class RegionsjobBackend(BaseModule, CapJob):
+class RegionsjobModule(BaseModule, CapJob):
NAME = 'regionsjob'
DESCRIPTION = u'regionsjob website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/sachsen/__init__.py b/modules/sachsen/__init__.py
index 3699d60c5149223c381f851fb284cade79e3dc26..dffec7e786c905f385ee55b4b1587d5c3d9719ee 100644
--- a/modules/sachsen/__init__.py
+++ b/modules/sachsen/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import SachsenLevelBackend
+from .backend import SachsenLevelModule
-__all__ = ['SachsenLevelBackend']
+__all__ = ['SachsenLevelModule']
diff --git a/modules/sachsen/backend.py b/modules/sachsen/backend.py
index 3c2ab15de8eb5437b817c21407b0a1a5a737ef75..b334d2ec6b411b0fe211415e33b9c3d570eb46c5 100644
--- a/modules/sachsen/backend.py
+++ b/modules/sachsen/backend.py
@@ -24,10 +24,10 @@
from weboob.tools.backend import BaseModule
-__all__ = ['SachsenLevelBackend']
+__all__ = ['SachsenLevelModule']
-class SachsenLevelBackend(BaseModule, CapGauge):
+class SachsenLevelModule(BaseModule, CapGauge):
NAME = 'sachsen'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/seeklyrics/__init__.py b/modules/seeklyrics/__init__.py
index d4538162dce088a0a0b0f359edc6bf021dc94ccb..88b7aed4951aecc29edba7a5ce343a77592048bf 100644
--- a/modules/seeklyrics/__init__.py
+++ b/modules/seeklyrics/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import SeeklyricsBackend
+from .backend import SeeklyricsModule
-__all__ = ['SeeklyricsBackend']
+__all__ = ['SeeklyricsModule']
diff --git a/modules/seeklyrics/backend.py b/modules/seeklyrics/backend.py
index b40b7c5b2bed2a0cd47172d5b3c9cd774991f233..e9236ac617019f0f486c0ea26a2d4a64dd97a701 100644
--- a/modules/seeklyrics/backend.py
+++ b/modules/seeklyrics/backend.py
@@ -24,10 +24,10 @@
from urllib import quote_plus
-__all__ = ['SeeklyricsBackend']
+__all__ = ['SeeklyricsModule']
-class SeeklyricsBackend(BaseModule, CapLyrics):
+class SeeklyricsModule(BaseModule, CapLyrics):
NAME = 'seeklyrics'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/seloger/__init__.py b/modules/seloger/__init__.py
index 10540bdbd6fcdea08763e404db1627d68148c71a..efcf67f19971e4bab80dce01cab56c46e88e2881 100644
--- a/modules/seloger/__init__.py
+++ b/modules/seloger/__init__.py
@@ -1,3 +1,3 @@
-from .backend import SeLogerBackend
+from .backend import SeLogerModule
-__all__ = ['SeLogerBackend']
+__all__ = ['SeLogerModule']
diff --git a/modules/seloger/backend.py b/modules/seloger/backend.py
index d36e71915579cf2e6349196f493e2645ce77ea81..5d9781e992c6d1b1ff8bc6e86b3b175ce6a2dca1 100644
--- a/modules/seloger/backend.py
+++ b/modules/seloger/backend.py
@@ -25,10 +25,10 @@
from .browser import SeLogerBrowser
-__all__ = ['SeLogerBackend']
+__all__ = ['SeLogerModule']
-class SeLogerBackend(BaseModule, CapHousing):
+class SeLogerModule(BaseModule, CapHousing):
NAME = 'seloger'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/senscritique/__init__.py b/modules/senscritique/__init__.py
index 9dc56a191779aada251da4a14ce773e72cc8a453..6bc070c78c9f3c52346f7044d3135d4046dcb733 100644
--- a/modules/senscritique/__init__.py
+++ b/modules/senscritique/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import SenscritiqueBackend
+from .backend import SenscritiqueModule
-__all__ = ['SenscritiqueBackend']
+__all__ = ['SenscritiqueModule']
diff --git a/modules/senscritique/backend.py b/modules/senscritique/backend.py
index afdc142c5da91749dc0e29b65c88814f302b8b6b..acd7791de0b5f3166f7108f0281c6a5650cec182 100644
--- a/modules/senscritique/backend.py
+++ b/modules/senscritique/backend.py
@@ -25,10 +25,10 @@
from .browser import SenscritiqueBrowser
from .calendar import SensCritiquenCalendarEvent
-__all__ = ['SenscritiqueBackend']
+__all__ = ['SenscritiqueModule']
-class SenscritiqueBackend(BaseModule, CapCalendarEvent):
+class SenscritiqueModule(BaseModule, CapCalendarEvent):
NAME = 'senscritique'
DESCRIPTION = u'senscritique website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/sfr/__init__.py b/modules/sfr/__init__.py
index 787cd7fda3cc4f2e5d527e1fc266a8242db0ae36..62f52f54ad29f83034cadac53a39418af12c11d2 100644
--- a/modules/sfr/__init__.py
+++ b/modules/sfr/__init__.py
@@ -1,3 +1,3 @@
-from .backend import SfrBackend
+from .backend import SfrModule
-__all__ = ['SfrBackend']
+__all__ = ['SfrModule']
diff --git a/modules/sfr/backend.py b/modules/sfr/backend.py
index 49a78e6356378376ded120971728da1f6ce34d9d..b432c7c9b55e7a018dea65348066e323828a9013 100644
--- a/modules/sfr/backend.py
+++ b/modules/sfr/backend.py
@@ -28,10 +28,10 @@
from .browser import SfrBrowser
-__all__ = ['SfrBackend']
+__all__ = ['SfrModule']
-class SfrBackend(BaseModule, CapAccount, CapMessages, CapMessagesPost):
+class SfrModule(BaseModule, CapAccount, CapMessages, CapMessagesPost):
NAME = 'sfr'
MAINTAINER = u'Christophe Benz'
EMAIL = 'christophe.benz@gmail.com'
diff --git a/modules/simplyreadit/__init__.py b/modules/simplyreadit/__init__.py
index 2ccc7e9daa19a37e722f96770493aa44e3f4864b..77051bbcc759ddf53272f218abfc99799654f6c5 100644
--- a/modules/simplyreadit/__init__.py
+++ b/modules/simplyreadit/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import SimplyreaditBackend
+from .backend import SimplyreaditModule
-__all__ = ['SimplyreaditBackend']
+__all__ = ['SimplyreaditModule']
diff --git a/modules/simplyreadit/backend.py b/modules/simplyreadit/backend.py
index 040fc91e580de8f3dfdeba31a01d4e9d34d44f5d..829b980f48e687ca09f62e096e4e18e763b1cf4d 100644
--- a/modules/simplyreadit/backend.py
+++ b/modules/simplyreadit/backend.py
@@ -17,12 +17,12 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderBackend, DisplayPage
+from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderModule, DisplayPage
-__all__ = ['SimplyreaditBackend']
+__all__ = ['SimplyreaditModule']
-class SimplyreaditBackend(GenericComicReaderBackend):
+class SimplyreaditModule(GenericComicReaderModule):
NAME = 'simplyreadit'
DESCRIPTION = 'SimplyReadIt manga reading website'
BROWSER_PARAMS = dict(
diff --git a/modules/societegenerale/__init__.py b/modules/societegenerale/__init__.py
index 4bc59dc67b528150a643fd2ce3c9005d60cd6be5..d6db70f039894a7cab70910f499ea22d536abe4d 100644
--- a/modules/societegenerale/__init__.py
+++ b/modules/societegenerale/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import SocieteGeneraleBackend
+from .backend import SocieteGeneraleModule
-__all__ = ['SocieteGeneraleBackend']
+__all__ = ['SocieteGeneraleModule']
diff --git a/modules/societegenerale/backend.py b/modules/societegenerale/backend.py
index 8e2480acc19fe6b904fc71fa6c605b98826b69c9..e3c1514ebdce60adf7917498f3e480789ec5c145 100644
--- a/modules/societegenerale/backend.py
+++ b/modules/societegenerale/backend.py
@@ -27,10 +27,10 @@
from .sgpe.browser import SGEnterpriseBrowser, SGProfessionalBrowser
-__all__ = ['SocieteGeneraleBackend']
+__all__ = ['SocieteGeneraleModule']
-class SocieteGeneraleBackend(BaseModule, CapBank):
+class SocieteGeneraleModule(BaseModule, CapBank):
NAME = 'societegenerale'
MAINTAINER = u'Jocelyn Jaubert'
EMAIL = 'jocelyn.jaubert@gmail.com'
diff --git a/modules/somafm/__init__.py b/modules/somafm/__init__.py
index eb868899a2ece2ae7108429660dc0e489d83646d..5b220594435e07f8e08902cb137e67ba192b3f36 100644
--- a/modules/somafm/__init__.py
+++ b/modules/somafm/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import SomaFMBackend
+from .backend import SomaFMModule
-__all__ = ['SomaFMBackend']
+__all__ = ['SomaFMModule']
diff --git a/modules/somafm/backend.py b/modules/somafm/backend.py
index 4189290e0a736e6ef026e2e8eb522be5ffad143d..11eead01dbb899d2512d93018c7c7b2af544fdb7 100644
--- a/modules/somafm/backend.py
+++ b/modules/somafm/backend.py
@@ -28,7 +28,7 @@
from weboob.tools.parsers.iparser import IParser
-__all__ = ['SomaFMBackend']
+__all__ = ['SomaFMModule']
class LxmlParser(IParser):
@@ -36,7 +36,7 @@ def parse(self, data, encoding=None):
return lxml.etree.fromstring(data.read())
-class SomaFMBackend(BaseModule, CapRadio, CapCollection):
+class SomaFMModule(BaseModule, CapRadio, CapCollection):
NAME = 'somafm'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
diff --git a/modules/sueurdemetal/__init__.py b/modules/sueurdemetal/__init__.py
index 5fc9c355beb4406c68a654d3e88439e8864a5299..a273f1ea65d542c280efe1ee3e438ef06811cdc8 100644
--- a/modules/sueurdemetal/__init__.py
+++ b/modules/sueurdemetal/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import SueurDeMetalBackend
+from .backend import SueurDeMetalModule
-__all__ = ['SueurDeMetalBackend']
+__all__ = ['SueurDeMetalModule']
diff --git a/modules/sueurdemetal/backend.py b/modules/sueurdemetal/backend.py
index 42b6671410fc22e6d34d637018a7c6b018eba7f1..23454b978cac9a7b573f5fae6122b35f30d92608 100644
--- a/modules/sueurdemetal/backend.py
+++ b/modules/sueurdemetal/backend.py
@@ -25,7 +25,7 @@
from .browser import SueurDeMetalBrowser
-__all__ = ['SueurDeMetalBackend']
+__all__ = ['SueurDeMetalModule']
class Concert(BaseCalendarEvent):
@@ -34,7 +34,7 @@ def id2url(cls, _id):
return 'http://www.sueurdemetal.com/detail-concert-metal.php?c=%s' % _id
-class SueurDeMetalBackend(BaseModule, CapCalendarEvent):
+class SueurDeMetalModule(BaseModule, CapCalendarEvent):
NAME = 'sueurdemetal'
DESCRIPTION = u'SueurDeMetal French concerts list website'
MAINTAINER = u'Vincent A'
@@ -47,7 +47,7 @@ class SueurDeMetalBackend(BaseModule, CapCalendarEvent):
ASSOCIATED_CATEGORIES = [CATEGORIES.CONCERT]
def __init__(self, *a, **kw):
- super(SueurDeMetalBackend, self).__init__(*a, **kw)
+ super(SueurDeMetalModule, self).__init__(*a, **kw)
self.cities = {}
def list_events(self, from_date, to_date=None):
diff --git a/modules/supertoinette/__init__.py b/modules/supertoinette/__init__.py
index 8d17e96431fe4d0035b537b23c803319b5a201cf..73760179ef62d51fe5fb6eca89dcbec9ab7c0142 100644
--- a/modules/supertoinette/__init__.py
+++ b/modules/supertoinette/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import SupertoinetteBackend
+from .backend import SupertoinetteModule
-__all__ = ['SupertoinetteBackend']
+__all__ = ['SupertoinetteModule']
diff --git a/modules/supertoinette/backend.py b/modules/supertoinette/backend.py
index 82ea4ddf55aff0e4888ae53c55e9116ba5c32b2f..fe0f7d07c94983de8e639e7086228cef6197ba8b 100644
--- a/modules/supertoinette/backend.py
+++ b/modules/supertoinette/backend.py
@@ -22,10 +22,10 @@
from .browser import SupertoinetteBrowser
-__all__ = ['SupertoinetteBackend']
+__all__ = ['SupertoinetteModule']
-class SupertoinetteBackend(BaseModule, CapRecipe):
+class SupertoinetteModule(BaseModule, CapRecipe):
NAME = 'supertoinette'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/taz/__init__.py b/modules/taz/__init__.py
index e2141f51ad149125b44c84c3ce16336d1724217e..c8c0476a6854fbdf0f8db7a5492156ecc40dd3d0 100644
--- a/modules/taz/__init__.py
+++ b/modules/taz/__init__.py
@@ -1,4 +1,4 @@
-"NewspaperTazBackend init"
+"NewspaperTazModule init"
# -*- coding: utf-8 -*-
# Copyright(C) 2012 Florent Fourcot
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import NewspaperTazBackend
+from .backend import NewspaperTazModule
-__all__ = ['NewspaperTazBackend']
+__all__ = ['NewspaperTazModule']
diff --git a/modules/taz/backend.py b/modules/taz/backend.py
index 02aeb5cca4d33bbeb378f1cbf510acba1d52af91..f90c312d4008d44f3a853ee401b24768b1f4aac1 100644
--- a/modules/taz/backend.py
+++ b/modules/taz/backend.py
@@ -19,12 +19,12 @@
"backend for http://www.taz.de"
from weboob.capabilities.messages import CapMessages
-from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
+from weboob.tools.capabilities.messages.GenericModule import GenericNewspaperModule
from .browser import NewspaperTazBrowser
from .tools import rssid, url2id
-class NewspaperTazBackend(GenericNewspaperBackend, CapMessages):
+class NewspaperTazModule(GenericNewspaperModule, CapMessages):
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
VERSION = '1.0'
diff --git a/modules/tinder/__init__.py b/modules/tinder/__init__.py
index 604bb6c2b74ff136bfd46e5cbe16360bce533323..5f8b93f0ecd99e7c157f9eb924977ca9b1266127 100644
--- a/modules/tinder/__init__.py
+++ b/modules/tinder/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import TinderBackend
+from .backend import TinderModule
-__all__ = ['TinderBackend']
+__all__ = ['TinderModule']
diff --git a/modules/tinder/backend.py b/modules/tinder/backend.py
index e64f4df82cbd30c60fe27c0a713b8c4ebcb67368..39ee1a6f05521ac1fd0bbd45b4a9fe31dc3fcb18 100644
--- a/modules/tinder/backend.py
+++ b/modules/tinder/backend.py
@@ -30,7 +30,7 @@
from .browser import TinderBrowser, FacebookBrowser
-__all__ = ['TinderBackend']
+__all__ = ['TinderModule']
class ProfilesWalker(Optimization):
@@ -65,7 +65,7 @@ def view_profile(self):
self.view_cron = self.sched.schedule(1, self.view_profile)
-class TinderBackend(BaseModule, CapMessages, CapMessagesPost, CapDating):
+class TinderModule(BaseModule, CapMessages, CapMessagesPost, CapDating):
NAME = 'tinder'
DESCRIPTION = u'Tinder dating mobile application'
MAINTAINER = u'Roger Philibert'
diff --git a/modules/transilien/__init__.py b/modules/transilien/__init__.py
index 058ca5835c96416a3573c304daabbdd0289ee721..0d8adc8f82fc585019a72056e411d83512fcb108 100644
--- a/modules/transilien/__init__.py
+++ b/modules/transilien/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import TransilienBackend
+from .backend import TransilienModule
-__all__ = ['TransilienBackend']
+__all__ = ['TransilienModule']
diff --git a/modules/transilien/backend.py b/modules/transilien/backend.py
index a6319a963c1b4b24a83ac53178717dcb87de1c25..22f98f2d279dd4788566da84656ae947551cc9d4 100644
--- a/modules/transilien/backend.py
+++ b/modules/transilien/backend.py
@@ -24,7 +24,7 @@
from .browser import Transilien
-class TransilienBackend(BaseModule, CapTravel):
+class TransilienModule(BaseModule, CapTravel):
NAME = 'transilien'
MAINTAINER = u'Julien Hébert'
EMAIL = 'juke@free.fr'
diff --git a/modules/trictractv/__init__.py b/modules/trictractv/__init__.py
index ee002cbdbb9d605f5097ff2473d40fbea46cd934..b8a78144fb7f33312715837f18a3350f577705c8 100644
--- a/modules/trictractv/__init__.py
+++ b/modules/trictractv/__init__.py
@@ -1,3 +1,3 @@
-from .backend import TricTracTVBackend
+from .backend import TricTracTVModule
-__all__ = ['TricTracTVBackend']
+__all__ = ['TricTracTVModule']
diff --git a/modules/trictractv/backend.py b/modules/trictractv/backend.py
index 3e2c56f3df80ac7843553a895c8acfeae71c7556..e864da49e17f8ebd0a3c805061ebac52cf66d981 100644
--- a/modules/trictractv/backend.py
+++ b/modules/trictractv/backend.py
@@ -28,10 +28,10 @@
from .video import TricTracTVVideo
-__all__ = ['TricTracTVBackend']
+__all__ = ['TricTracTVModule']
-class TricTracTVBackend(BaseModule, CapVideo):
+class TricTracTVModule(BaseModule, CapVideo):
NAME = 'trictractv'
MAINTAINER = u'Benjamin Drieu'
EMAIL = 'benjamin@drieu.org'
diff --git a/modules/tvsubtitles/__init__.py b/modules/tvsubtitles/__init__.py
index ee939e1d1b16c2006175172230686fa37b495770..9b43e402e370d1b4321227c36de4022f42cbfcd4 100644
--- a/modules/tvsubtitles/__init__.py
+++ b/modules/tvsubtitles/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import TvsubtitlesBackend
+from .backend import TvsubtitlesModule
-__all__ = ['TvsubtitlesBackend']
+__all__ = ['TvsubtitlesModule']
diff --git a/modules/tvsubtitles/backend.py b/modules/tvsubtitles/backend.py
index 5a683e4ddf88aecf0189b0386ce71d336a2e421a..e5d668d2ff2cf35eccdf4c69067384e552a03b38 100644
--- a/modules/tvsubtitles/backend.py
+++ b/modules/tvsubtitles/backend.py
@@ -24,10 +24,10 @@
from urllib import quote_plus
-__all__ = ['TvsubtitlesBackend']
+__all__ = ['TvsubtitlesModule']
-class TvsubtitlesBackend(BaseModule, CapSubtitle):
+class TvsubtitlesModule(BaseModule, CapSubtitle):
NAME = 'tvsubtitles'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/twitter/__init__.py b/modules/twitter/__init__.py
index d9beadcf00e8211639fafa1d7f8ba8cadef695f7..5f1d4d2743e89340b1583056a6306a8b82d5e531 100644
--- a/modules/twitter/__init__.py
+++ b/modules/twitter/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import TwitterBackend
+from .backend import TwitterModule
-__all__ = ['TwitterBackend']
+__all__ = ['TwitterModule']
diff --git a/modules/twitter/backend.py b/modules/twitter/backend.py
index 3dbb486a8403e46e324401f97673a75b2d448f98..bb56fae944353a5900f66ddd6c13ceb2abfd84c7 100644
--- a/modules/twitter/backend.py
+++ b/modules/twitter/backend.py
@@ -27,10 +27,10 @@
from .browser import TwitterBrowser
import itertools
-__all__ = ['TwitterBackend']
+__all__ = ['TwitterModule']
-class TwitterBackend(BaseModule, CapMessages, CapMessagesPost, CapCollection):
+class TwitterModule(BaseModule, CapMessages, CapMessagesPost, CapCollection):
NAME = 'twitter'
DESCRIPTION = u'twitter website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/unsee/__init__.py b/modules/unsee/__init__.py
index 31ad5ac263855377501cf6396fb08b39c1de3925..afef1ea186ba5099795cb756720c951f44c159b3 100644
--- a/modules/unsee/__init__.py
+++ b/modules/unsee/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import UnseeBackend
+from .backend import UnseeModule
-__all__ = ['UnseeBackend']
+__all__ = ['UnseeModule']
diff --git a/modules/unsee/backend.py b/modules/unsee/backend.py
index 32122d96e3fb70743c81abb427db498e70058e2f..9d7229c57a16cf8d0455702a621faec172cd73ea 100644
--- a/modules/unsee/backend.py
+++ b/modules/unsee/backend.py
@@ -20,14 +20,14 @@
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 BasePasteModule
from weboob.tools.capabilities.paste import image_mime
import re
from .browser import UnseeBrowser
-__all__ = ['UnseeBackend']
+__all__ = ['UnseeModule']
class UnPaste(BasePaste):
@@ -36,7 +36,7 @@ def id2url(cls, id):
return 'https://unsee.cc/%s' % id
-class UnseeBackend(BaseModule, BasePasteBackend):
+class UnseeModule(BaseModule, BasePasteModule):
NAME = 'unsee'
DESCRIPTION = u'unsee.cc expiring image hosting'
MAINTAINER = u'Vincent A'
diff --git a/modules/ups/__init__.py b/modules/ups/__init__.py
index dd5379d5537bf1eded11af0a93606c328428b02e..efa4f4552eb330aa7a234f5a789f5d907c86ab77 100644
--- a/modules/ups/__init__.py
+++ b/modules/ups/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import UpsBackend
+from .backend import UpsModule
-__all__ = ['UpsBackend']
+__all__ = ['UpsModule']
diff --git a/modules/ups/backend.py b/modules/ups/backend.py
index c43a36768e335394bb9478ba065e365171274bf4..e8a87b5656982b4c93590fdfa428f2e346f75350 100644
--- a/modules/ups/backend.py
+++ b/modules/ups/backend.py
@@ -24,10 +24,10 @@
from .browser import UpsBrowser
-__all__ = ['UpsBackend']
+__all__ = ['UpsModule']
-class UpsBackend(BaseModule, CapParcel):
+class UpsModule(BaseModule, CapParcel):
NAME = 'ups'
DESCRIPTION = u'UPS website'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/vimeo/__init__.py b/modules/vimeo/__init__.py
index 18aef7794362bc00bf59b5d13fdeab236dc2aa72..7f8f7972162d495baa03ffdbc85681a54b32e05b 100644
--- a/modules/vimeo/__init__.py
+++ b/modules/vimeo/__init__.py
@@ -1,3 +1,3 @@
-from .backend import VimeoBackend
+from .backend import VimeoModule
-__all__ = ['VimeoBackend']
+__all__ = ['VimeoModule']
diff --git a/modules/vimeo/backend.py b/modules/vimeo/backend.py
index 217ee88f08b5b1481cc2c083e71491107f97e4f4..556e9ccb91b934d0a302a16b53ba52baea5e4863 100644
--- a/modules/vimeo/backend.py
+++ b/modules/vimeo/backend.py
@@ -27,10 +27,10 @@
import re
-__all__ = ['VimeoBackend']
+__all__ = ['VimeoModule']
-class VimeoBackend(BaseModule, CapVideo, CapCollection):
+class VimeoModule(BaseModule, CapVideo, CapCollection):
NAME = 'vimeo'
MAINTAINER = u'François Revol'
EMAIL = 'revol@free.fr'
diff --git a/modules/vlille/__init__.py b/modules/vlille/__init__.py
index 95e4ca19ae625865edeee6f48fd0a333036526c8..06fd4edb090aa0527b33a9ce053581f0f7561f3c 100644
--- a/modules/vlille/__init__.py
+++ b/modules/vlille/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import VlilleBackend
+from .backend import VlilleModule
-__all__ = ['VlilleBackend']
+__all__ = ['VlilleModule']
diff --git a/modules/vlille/backend.py b/modules/vlille/backend.py
index 9391574b4320d31164c670c27ef089683e659758..aa404416d8df995e6306b6b9f1d8282d54d8279b 100644
--- a/modules/vlille/backend.py
+++ b/modules/vlille/backend.py
@@ -24,10 +24,10 @@
from .browser import VlilleBrowser
-__all__ = ['VlilleBackend']
+__all__ = ['VlilleModule']
-class VlilleBackend(BaseModule, CapGauge):
+class VlilleModule(BaseModule, CapGauge):
NAME = 'vlille'
DESCRIPTION = u'access to vlille datas'
MAINTAINER = u'Bezleputh'
diff --git a/modules/voyagessncf/__init__.py b/modules/voyagessncf/__init__.py
index 509b9e95fd1ca049116931e50ac70619c0502228..9d1dbfd3f4f57c8cb9426603ef5a073655dd2415 100644
--- a/modules/voyagessncf/__init__.py
+++ b/modules/voyagessncf/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import VoyagesSNCFBackend
+from .backend import VoyagesSNCFModule
-__all__ = ['VoyagesSNCFBackend']
+__all__ = ['VoyagesSNCFModule']
diff --git a/modules/voyagessncf/backend.py b/modules/voyagessncf/backend.py
index 1664d1a88f4bd537be434c94f1ffebd7f219b11f..4c1e1b60238fe0bf88ea2577c703df6edce64709 100644
--- a/modules/voyagessncf/backend.py
+++ b/modules/voyagessncf/backend.py
@@ -27,10 +27,10 @@
from .browser import VoyagesSNCFBrowser
-__all__ = ['VoyagesSNCFBackend']
+__all__ = ['VoyagesSNCFModule']
-class VoyagesSNCFBackend(BaseModule, CapTravel):
+class VoyagesSNCFModule(BaseModule, CapTravel):
NAME = 'voyagessncf'
DESCRIPTION = u'Voyages SNCF'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/weather/__init__.py b/modules/weather/__init__.py
index 2fdf784ccf83b344233d7319d85c7975b88ba981..5e7ee611669639cb7f5da601367d6459ad00746f 100644
--- a/modules/weather/__init__.py
+++ b/modules/weather/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import WeatherBackend
+from .backend import WeatherModule
-__all__ = ['WeatherBackend']
+__all__ = ['WeatherModule']
diff --git a/modules/weather/backend.py b/modules/weather/backend.py
index 865183c92ac7c21fb34bda089605cf5cecde02ea..0303ba67fd6a03143ee6e77198731a2f8b6ec0aa 100644
--- a/modules/weather/backend.py
+++ b/modules/weather/backend.py
@@ -23,10 +23,10 @@
from .browser import WeatherBrowser
-__all__ = ['WeatherBackend']
+__all__ = ['WeatherModule']
-class WeatherBackend(BaseModule, CapWeather):
+class WeatherModule(BaseModule, CapWeather):
NAME = 'weather'
MAINTAINER = u'Arno Renevier'
EMAIL = 'arno@renevier.net'
diff --git a/modules/wellsfargo/__init__.py b/modules/wellsfargo/__init__.py
index 2315292610e5812d4f77e8aff3fc535d35481031..5a3e32f03de56053629aeacdb725e5fe75be6fca 100644
--- a/modules/wellsfargo/__init__.py
+++ b/modules/wellsfargo/__init__.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from .backend import WellsFargoBackend
+from .backend import WellsFargoModule
-__all__ = ['WellsFargoBackend']
+__all__ = ['WellsFargoModule']
diff --git a/modules/wellsfargo/backend.py b/modules/wellsfargo/backend.py
index 6338c316e78af82c8a162b06756dd451be4bff71..53cbc3e066ac02471216fdab9cc2b844d08ab91a 100644
--- a/modules/wellsfargo/backend.py
+++ b/modules/wellsfargo/backend.py
@@ -25,10 +25,10 @@
from .browser import WellsFargo
-__all__ = ['WellsFargoBackend']
+__all__ = ['WellsFargoModule']
-class WellsFargoBackend(BaseModule, CapBank):
+class WellsFargoModule(BaseModule, CapBank):
NAME = 'wellsfargo'
MAINTAINER = u'Oleg Plakhotniuk'
EMAIL = 'olegus8@gmail.com'
diff --git a/modules/wordreference/__init__.py b/modules/wordreference/__init__.py
index 51bbb3cbff456c0e131da3747e98a705d6b542bd..a9c317c4d085978f0fbd34dd578090e8c29aadca 100644
--- a/modules/wordreference/__init__.py
+++ b/modules/wordreference/__init__.py
@@ -1,4 +1,4 @@
-"WordReferenceBackend init"
+"WordReferenceModule init"
# -*- coding: utf-8 -*-
# Copyright(C) 2012 Lucien Loiseau
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import WordReferenceBackend
+from .backend import WordReferenceModule
-__all__ = ['WordReferenceBackend']
+__all__ = ['WordReferenceModule']
diff --git a/modules/wordreference/backend.py b/modules/wordreference/backend.py
index 96cf449777400fbc8b988e6353c9d16606ef212a..d4bc5de3468b543461a8a7ce3d1f5296e4ea71c1 100644
--- a/modules/wordreference/backend.py
+++ b/modules/wordreference/backend.py
@@ -25,10 +25,10 @@
from .browser import WordReferenceBrowser
-__all__ = ['WordReferenceBackend']
+__all__ = ['WordReferenceModule']
-class WordReferenceBackend(BaseModule, CapTranslate):
+class WordReferenceModule(BaseModule, CapTranslate):
MAINTAINER = u'Lucien Loiseau'
EMAIL = 'loiseau.lucien@gmail.com'
VERSION = '1.0'
diff --git a/modules/yahoo/__init__.py b/modules/yahoo/__init__.py
index d8004455cf6d4afa1a79377bc3df2b921bf7fa21..1e4d21ba6912db54b7e60fcc2bf57446a209bc27 100644
--- a/modules/yahoo/__init__.py
+++ b/modules/yahoo/__init__.py
@@ -18,6 +18,6 @@
# along with weboob. If not, see .
-from .backend import YahooBackend
+from .backend import YahooModule
-__all__ = ['YahooBackend']
+__all__ = ['YahooModule']
diff --git a/modules/yahoo/backend.py b/modules/yahoo/backend.py
index 9e3051071e6e6fef32a0b52eeebb30234fe021ec..53fafbdaa829e02ee3242fb80e5bc1dda3e474e0 100644
--- a/modules/yahoo/backend.py
+++ b/modules/yahoo/backend.py
@@ -27,10 +27,10 @@
from weboob.tools.browser import StandardBrowser
-__all__ = ['YahooBackend']
+__all__ = ['YahooModule']
-class YahooBackend(BaseModule, CapWeather):
+class YahooModule(BaseModule, CapWeather):
NAME = 'yahoo'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/youjizz/__init__.py b/modules/youjizz/__init__.py
index eb4e0d020b1f900223761b9f2ddb6b8cd5cd5117..03c9947b9ae04ff064a9c35e4d43bf581b84b898 100644
--- a/modules/youjizz/__init__.py
+++ b/modules/youjizz/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import YoujizzBackend
+from .backend import YoujizzModule
-__all__ = ['YoujizzBackend']
+__all__ = ['YoujizzModule']
diff --git a/modules/youjizz/backend.py b/modules/youjizz/backend.py
index 7a338bce0060ab4f6c6052cf5d8819ad7448c344..3d62ea405f2c1c9e83b30eb6246683541180f07d 100644
--- a/modules/youjizz/backend.py
+++ b/modules/youjizz/backend.py
@@ -27,10 +27,10 @@
from .browser import YoujizzBrowser
-__all__ = ['YoujizzBackend']
+__all__ = ['YoujizzModule']
-class YoujizzBackend(BaseModule, CapVideo, CapCollection):
+class YoujizzModule(BaseModule, CapVideo, CapCollection):
NAME = 'youjizz'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
diff --git a/modules/youporn/__init__.py b/modules/youporn/__init__.py
index 0546c5aa90b388061ad989a03790a933da010587..5c34d9cc03faeb27deedace5e1265458c42f5213 100644
--- a/modules/youporn/__init__.py
+++ b/modules/youporn/__init__.py
@@ -1,3 +1,3 @@
-from .backend import YoupornBackend
+from .backend import YoupornModule
-__all__ = ['YoupornBackend']
+__all__ = ['YoupornModule']
diff --git a/modules/youporn/backend.py b/modules/youporn/backend.py
index eef458d8bc3cf0c4c1cfe5c1cfec08bd1d91ffc6..be5691f25eeba8ac726df4970b47fcea7b7d8447 100644
--- a/modules/youporn/backend.py
+++ b/modules/youporn/backend.py
@@ -28,10 +28,10 @@
from .video import YoupornVideo
-__all__ = ['YoupornBackend']
+__all__ = ['YoupornModule']
-class YoupornBackend(BaseModule, CapVideo, CapCollection):
+class YoupornModule(BaseModule, CapVideo, CapCollection):
NAME = 'youporn'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/youtube/__init__.py b/modules/youtube/__init__.py
index 1e96879547502f6e1facddee1da743047036d82b..dd83336d8dd5fbb830e7c30b96d9598919cb772f 100644
--- a/modules/youtube/__init__.py
+++ b/modules/youtube/__init__.py
@@ -17,6 +17,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .backend import YoutubeBackend
+from .backend import YoutubeModule
-__all__ = ['YoutubeBackend']
+__all__ = ['YoutubeModule']
diff --git a/modules/youtube/backend.py b/modules/youtube/backend.py
index f924e379dc62cf55c464e296b96ff81ad1374520..757a00eebb8374640d4fd3ea5d3cae1757d2388f 100644
--- a/modules/youtube/backend.py
+++ b/modules/youtube/backend.py
@@ -41,10 +41,10 @@
from .video import YoutubeVideo
-__all__ = ['YoutubeBackend']
+__all__ = ['YoutubeModule']
-class YoutubeBackend(BaseModule, CapVideo, CapCollection):
+class YoutubeModule(BaseModule, CapVideo, CapCollection):
NAME = 'youtube'
MAINTAINER = u'Laurent Bachelier'
EMAIL = 'laurent@bachelier.name'
diff --git a/tools/boilerplate.py b/tools/boilerplate.py
index 53d909fe1c4314e387eccf5254720d5858024863..ea22033b108e5560d5f4ce6b4bdbd7ab3988216b 100755
--- a/tools/boilerplate.py
+++ b/tools/boilerplate.py
@@ -61,7 +61,7 @@ class Recipe(object):
@classmethod
def configure_subparser(cls, subparsers):
subparser = subparsers.add_parser(cls.NAME)
- subparser.add_argument('name', help='Backend name')
+ subparser.add_argument('name', help='Module name')
subparser.set_defaults(recipe=cls)
return subparser
diff --git a/tools/boilerplate_data/cap_backend.py b/tools/boilerplate_data/cap_backend.py
index 9ee78af81327450c312db2c6116c10240e51112d..59242900a551c4fa4fa38b0d0c083b10093257a0 100644
--- a/tools/boilerplate_data/cap_backend.py
+++ b/tools/boilerplate_data/cap_backend.py
@@ -5,10 +5,10 @@
from .browser import ${r.classname}Browser
-__all__ = ['${r.classname}Backend']
+__all__ = ['${r.classname}Module']
-class ${r.classname}Backend(BaseModule, ${r.capname}):
+class ${r.classname}Module(BaseModule, ${r.capname}):
NAME = '${r.name}'
DESCRIPTION = u'${r.name} website'
MAINTAINER = u'${r.author}'
diff --git a/tools/boilerplate_data/comic_backend.py b/tools/boilerplate_data/comic_backend.py
index 4d9f7be5ed07ecf278d9134364c2eeb5d53260b3..98ed7e995dcffc901f9f976833cbdc0a6b64b2ac 100644
--- a/tools/boilerplate_data/comic_backend.py
+++ b/tools/boilerplate_data/comic_backend.py
@@ -1,11 +1,11 @@
<%inherit file="layout.py"/>
-from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderBackend, DisplayPage
+from weboob.tools.capabilities.gallery.genericcomicreader import GenericComicReaderModule, DisplayPage
-__all__ = ['${r.classname}Backend']
+__all__ = ['${r.classname}Module']
-class ${r.classname}Backend(GenericComicReaderBackend):
+class ${r.classname}Module(GenericComicReaderModule):
NAME = '${r.name}'
DESCRIPTION = u'${r.name} manga reading site'
MAINTAINER = u'${r.author}'
diff --git a/tools/boilerplate_data/init.py b/tools/boilerplate_data/init.py
index 6b4e6638d7618573754214ab93968efee92976c3..718f1742d9dfbff680909fe30bc428e16162f63d 100644
--- a/tools/boilerplate_data/init.py
+++ b/tools/boilerplate_data/init.py
@@ -1,5 +1,5 @@
<%inherit file="layout.py"/>
-from .backend import ${r.classname}Backend
+from .backend import ${r.classname}Module
-__all__ = ['${r.classname}Backend']
+__all__ = ['${r.classname}Module']
diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py
index c36139880ba9f424b96db105a98448c43e55c881..f2a844ff4921b78a8cbe92028fd6d9e78513f15b 100644
--- a/weboob/tools/backend.py
+++ b/weboob/tools/backend.py
@@ -219,19 +219,19 @@ class BaseModule(object):
:param logger: logger
:type logger: :class:`logging.Logger`
"""
- # Backend name.
+ # Module name.
NAME = None
- # Name of the maintainer of this backend.
+ # Name of the maintainer of this module.
MAINTAINER = u''
# Email address of the maintainer.
EMAIL = ''
- # Version of backend (for information only).
+ # Version of module (for information only).
VERSION = ''
# Description
DESCRIPTION = ''
- # License of this backend.
+ # License of this module.
LICENSE = ''
- # Configuration required for this backend.
+ # Configuration required for backends.
# Values must be weboob.tools.value.Value objects.
CONFIG = BackendConfig()
# Storage
diff --git a/weboob/tools/capabilities/gallery/genericcomicreader.py b/weboob/tools/capabilities/gallery/genericcomicreader.py
index e65cc593e07d24af7ff5ab1d1e8beaf80a2823b5..fa9c00515e9f583c45c0cb6b6ac96e1be2028032 100644
--- a/weboob/tools/capabilities/gallery/genericcomicreader.py
+++ b/weboob/tools/capabilities/gallery/genericcomicreader.py
@@ -25,7 +25,7 @@
from weboob.tools.backend import BaseModule
from weboob.tools.browser import BaseBrowser, BasePage
-__all__ = ['GenericComicReaderBackend']
+__all__ = ['GenericComicReaderModule']
class DisplayPage(BasePage):
@@ -63,7 +63,7 @@ def fill_image(self, image, fields):
image.data = self.readurl(image.url)
-class GenericComicReaderBackend(BaseModule, CapGallery):
+class GenericComicReaderModule(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 eeb1cd3888683854eade4166a0ed37aa3395e58b..cdc0cdc57088211a40492de4495edc4276978cec 100644
--- a/weboob/tools/capabilities/messages/GenericBackend.py
+++ b/weboob/tools/capabilities/messages/GenericBackend.py
@@ -25,9 +25,9 @@
from weboob.tools.newsfeed import Newsfeed
-class GenericNewspaperBackend(BaseModule, CapMessages):
+class GenericNewspaperModule(BaseModule, CapMessages):
"""
- GenericNewspaperBackend class
+ GenericNewspaperModule class
"""
MAINTAINER = u'Julien Hebert'
EMAIL = 'juke@free.fr'
@@ -78,7 +78,7 @@ def get_thread(self, _id):
return thread
def iter_threads(self):
- for article in Newsfeed(self.RSS_FEED, GenericNewspaperBackend.RSSID).iter_entries():
+ for article in Newsfeed(self.RSS_FEED, GenericNewspaperModule.RSSID).iter_entries():
thread = Thread(article.id)
thread.title = article.title
thread.date = article.datetime
diff --git a/weboob/tools/capabilities/paste.py b/weboob/tools/capabilities/paste.py
index ae2e934c6b4649a9ab4fa8c587394dbd4226de1f..0574c57b844a7b5bc1ad3aa41049f50791415d37 100644
--- a/weboob/tools/capabilities/paste.py
+++ b/weboob/tools/capabilities/paste.py
@@ -24,7 +24,7 @@
import binascii
-class BasePasteBackend(CapPaste):
+class BasePasteModule(CapPaste):
EXPIRATIONS = {}
"""
List of expirations and their corresponding remote codes (any type can be used).
@@ -71,18 +71,18 @@ def image_mime(data_base64, supported_formats=('gif', 'jpeg', 'png')):
return 'image/tiff'
def test():
- class MockPasteBackend(BasePasteBackend):
+ class MockPasteModule(BasePasteModule):
def __init__(self, expirations):
self.EXPIRATIONS = expirations
# all expirations are too high
- assert MockPasteBackend({1337: '', 42: '', False: ''}).get_closest_expiration(1) is None
+ assert MockPasteModule({1337: '', 42: '', False: ''}).get_closest_expiration(1) is None
# we found a suitable lower or equal expiration
- assert MockPasteBackend({1337: '', 42: '', False: ''}).get_closest_expiration(84) is 42
- assert MockPasteBackend({1337: '', 42: '', False: ''}).get_closest_expiration(False) is False
- assert MockPasteBackend({1337: '', 42: ''}).get_closest_expiration(False) is 1337
- assert MockPasteBackend({1337: '', 42: '', False: ''}).get_closest_expiration(1336) is 42
- assert MockPasteBackend({1337: '', 42: '', False: ''}).get_closest_expiration(1337) is 1337
- assert MockPasteBackend({1337: '', 42: '', False: ''}).get_closest_expiration(1338) is 1337
+ assert MockPasteModule({1337: '', 42: '', False: ''}).get_closest_expiration(84) is 42
+ assert MockPasteModule({1337: '', 42: '', False: ''}).get_closest_expiration(False) is False
+ assert MockPasteModule({1337: '', 42: ''}).get_closest_expiration(False) is 1337
+ assert MockPasteModule({1337: '', 42: '', False: ''}).get_closest_expiration(1336) is 42
+ assert MockPasteModule({1337: '', 42: '', False: ''}).get_closest_expiration(1337) is 1337
+ assert MockPasteModule({1337: '', 42: '', False: ''}).get_closest_expiration(1338) is 1337
# this format should work, though of doubtful usage
- assert MockPasteBackend([1337, 42, False]).get_closest_expiration(84) is 42
+ assert MockPasteModule([1337, 42, False]).get_closest_expiration(84) is 42