diff --git a/modules/750g/backend.py b/modules/750g/backend.py
index 74a601b2ec4cf682ab514c54f98523f4eb7e180e..559e2be3f68135c45f4d232917c844d2dada10dd 100644
--- a/modules/750g/backend.py
+++ b/modules/750g/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.recipe import ICapRecipe, Recipe
+from weboob.capabilities.recipe import CapRecipe, Recipe
from weboob.tools.backend import BaseBackend
from .browser import SevenFiftyGramsBrowser
@@ -30,7 +30,7 @@ def strip_accents(s):
__all__ = ['SevenFiftyGramsBackend']
-class SevenFiftyGramsBackend(BaseBackend, ICapRecipe):
+class SevenFiftyGramsBackend(BaseBackend, CapRecipe):
NAME = '750g'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/adecco/backend.py b/modules/adecco/backend.py
index 522578623cdda007eb6c86410641350f28d91b5e..e3013d2dadab0795aac96c096a9e63895229604d 100644
--- a/modules/adecco/backend.py
+++ b/modules/adecco/backend.py
@@ -21,14 +21,14 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import Value
-from weboob.capabilities.job import ICapJob
+from weboob.capabilities.job import CapJob
from .browser import AdeccoBrowser
from .job import AdeccoJobAdvert
__all__ = ['AdeccoBackend']
-class AdeccoBackend(BaseBackend, ICapJob):
+class AdeccoBackend(BaseBackend, CapJob):
NAME = 'adecco'
DESCRIPTION = u'adecco website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/allocine/backend.py b/modules/allocine/backend.py
index 02f02aa7d8995c47a2b8848b00dd7332e6d2d569..3a54722db472cb6b3acd59c6b0671c41763f2b6a 100644
--- a/modules/allocine/backend.py
+++ b/modules/allocine/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.cinema import ICapCinema, Person, Movie
+from weboob.capabilities.cinema import CapCinema, Person, Movie
from weboob.tools.backend import BaseBackend
from .browser import AllocineBrowser
@@ -27,7 +27,7 @@
__all__ = ['AllocineBackend']
-class AllocineBackend(BaseBackend, ICapCinema):
+class AllocineBackend(BaseBackend, CapCinema):
NAME = 'allocine'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/alloresto/backend.py b/modules/alloresto/backend.py
index 61bb0f60d731db67a6a0d1a35da4235887931882..f3d608c83adc8c77b5c2289d8bb69816b5b9ec88 100644
--- a/modules/alloresto/backend.py
+++ b/modules/alloresto/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['AlloRestoBackend']
-class AlloRestoBackend(BaseBackend, ICapBank):
+class AlloRestoBackend(BaseBackend, CapBank):
NAME = 'alloresto'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/allrecipes/backend.py b/modules/allrecipes/backend.py
index e67f1f1735c5a0953061ffb646db152409b7a34c..e991b08b28613007dca69adda9e954bce6c8c2c2 100644
--- a/modules/allrecipes/backend.py
+++ b/modules/allrecipes/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.recipe import ICapRecipe, Recipe
+from weboob.capabilities.recipe import CapRecipe, Recipe
from weboob.tools.backend import BaseBackend
from .browser import AllrecipesBrowser
@@ -27,7 +27,7 @@
__all__ = ['AllrecipesBackend']
-class AllrecipesBackend(BaseBackend, ICapRecipe):
+class AllrecipesBackend(BaseBackend, CapRecipe):
NAME = 'allrecipes'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/ameli/backend.py b/modules/ameli/backend.py
index f8d1da9e97e2ebd2e6c73e1090591190219cf776..e7fa6c43d8bc575b46ca549399d95db16bbcd1cd 100644
--- a/modules/ameli/backend.py
+++ b/modules/ameli/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
import urllib
-from weboob.capabilities.bill import ICapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill
+from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
from .browser import AmeliBrowser
@@ -26,7 +26,7 @@
__all__ = ['AmeliBackend']
-class AmeliBackend(BaseBackend, ICapBill):
+class AmeliBackend(BaseBackend, CapBill):
NAME = 'ameli'
DESCRIPTION = u'Ameli website: French Health Insurance'
MAINTAINER = u'Christophe Lampin'
diff --git a/modules/amelipro/backend.py b/modules/amelipro/backend.py
index 327411a0ba13600c261356e38b2fb432b6809b4b..bab889ca16fb65347c297f31e709a981353a7aae 100644
--- a/modules/amelipro/backend.py
+++ b/modules/amelipro/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
import urllib
-from weboob.capabilities.bill import ICapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill
+from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
from .browser import AmeliProBrowser
@@ -26,7 +26,7 @@
__all__ = ['AmeliProBackend']
-class AmeliProBackend(BaseBackend, ICapBill):
+class AmeliProBackend(BaseBackend, CapBill):
NAME = 'amelipro'
DESCRIPTION = u'Ameli website: French Health Insurance for Professionals'
MAINTAINER = u'Christophe Lampin'
diff --git a/modules/americanexpress/backend.py b/modules/americanexpress/backend.py
index 7d0264fa84f29f71616ecb331ddd5b7091d581dc..45192fa3e496595eb3f4efa36bdf30fd87feddcc 100644
--- a/modules/americanexpress/backend.py
+++ b/modules/americanexpress/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['AmericanExpressBackend']
-class AmericanExpressBackend(BaseBackend, ICapBank):
+class AmericanExpressBackend(BaseBackend, CapBank):
NAME = 'americanexpress'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/apec/backend.py b/modules/apec/backend.py
index 238e756b7e5a9fa84ad6f1b9f4ab1b9257ab5c82..7c7f06e9d7a089dc5daf6a29abeec55388ccdd89 100644
--- a/modules/apec/backend.py
+++ b/modules/apec/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.job import ICapJob
+from weboob.capabilities.job import CapJob
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import Value
from .browser import ApecBrowser
@@ -28,7 +28,7 @@
__all__ = ['ApecBackend']
-class ApecBackend(BaseBackend, ICapJob):
+class ApecBackend(BaseBackend, CapJob):
NAME = 'apec'
DESCRIPTION = u'apec website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/apivie/backend.py b/modules/apivie/backend.py
index 23494636aadeae261d354366d8e57d63b2525777..0e46a19f33548141e5f8c9662d4e49a25595050c 100644
--- a/modules/apivie/backend.py
+++ b/modules/apivie/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank
+from weboob.capabilities.bank import CapBank
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -27,7 +27,7 @@
__all__ = ['ApivieBackend']
-class ApivieBackend(BaseBackend, ICapBank):
+class ApivieBackend(BaseBackend, CapBank):
NAME = 'apivie'
DESCRIPTION = u'Apivie'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/arretsurimages/backend.py b/modules/arretsurimages/backend.py
index a506f939f06f59de49db8572aa82a75e2ac0d66b..fcdb8b91b78138a23b74f42c1d789d7deae6bf88 100644
--- a/modules/arretsurimages/backend.py
+++ b/modules/arretsurimages/backend.py
@@ -18,8 +18,8 @@
# along with weboob. If not, see .
-from weboob.capabilities.video import ICapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.video import CapVideo, BaseVideo
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['ArretSurImagesBackend']
-class ArretSurImagesBackend(BaseBackend, ICapVideo, ICapCollection):
+class ArretSurImagesBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'arretsurimages'
DESCRIPTION = u'arretsurimages website'
MAINTAINER = u'franek'
@@ -43,7 +43,7 @@ class ArretSurImagesBackend(BaseBackend, ICapVideo, ICapCollection):
def create_default_browser(self):
return self.create_browser(self.config['login'].get(), self.config['password'].get())
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
with self.browser:
return self.browser.search_videos(pattern)
# raise UserError('Search does not work on ASI website, use ls latest command')
diff --git a/modules/arte/backend.py b/modules/arte/backend.py
index 2e9d1e88aab0ffaac0ebffe6cde977e63453ee55..d18c5629cbcdf539c3556eca55f4f6f6ea9beb9b 100644
--- a/modules/arte/backend.py
+++ b/modules/arte/backend.py
@@ -20,8 +20,8 @@
import re
-from weboob.capabilities.video import ICapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound, Collection
+from weboob.capabilities.video import CapVideo, BaseVideo
+from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value
@@ -32,7 +32,7 @@
__all__ = ['ArteBackend']
-class ArteBackend(BaseBackend, ICapVideo, ICapCollection):
+class ArteBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'arte'
MAINTAINER = u'Bezleputh'
EMAIL = 'carton_ben@yahoo.fr'
@@ -95,7 +95,7 @@ def get_video(self, _id):
else:
return self.browser.get_video(_id)
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
with self.browser:
return self.browser.search_videos(pattern)
diff --git a/modules/attilasub/backend.py b/modules/attilasub/backend.py
index 813ba47795ca6967c53646a0be2824884f32fac8..b3159906db4a982fe613d45b4d582ba08365bd6a 100644
--- a/modules/attilasub/backend.py
+++ b/modules/attilasub/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.subtitle import ICapSubtitle, LanguageNotSupported
+from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported
from weboob.tools.backend import BaseBackend
from .browser import AttilasubBrowser
@@ -27,7 +27,7 @@
__all__ = ['AttilasubBackend']
-class AttilasubBackend(BaseBackend, ICapSubtitle):
+class AttilasubBackend(BaseBackend, CapSubtitle):
NAME = 'attilasub'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/audioaddict/backend.py b/modules/audioaddict/backend.py
index fec44229dbe93c2a15afc4f60975eaada44ba41c..1ff90073cc72cce94b2fbafc86299f15f8fa4d26 100644
--- a/modules/audioaddict/backend.py
+++ b/modules/audioaddict/backend.py
@@ -18,10 +18,10 @@
# along with weboob. If not, see .
-from weboob.capabilities.radio import ICapRadio, Radio
+from weboob.capabilities.radio import CapRadio, Radio
from weboob.capabilities.audiostream import BaseAudioStream
from weboob.tools.capabilities.streaminfo import StreamInfo
-from weboob.capabilities.collection import ICapCollection, Collection
+from weboob.capabilities.collection import CapCollection, Collection
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value
from weboob.tools.browser import StandardBrowser
@@ -38,7 +38,7 @@
# option to another player in the ~/.config/weboob/radioob config file:
# [ROOT]
# media_player = your_non_mplayer_player
-class AudioAddictBackend(BaseBackend, ICapRadio, ICapCollection):
+class AudioAddictBackend(BaseBackend, CapRadio, CapCollection):
NAME = 'audioaddict'
MAINTAINER = u'Pierre Mazière'
EMAIL = 'pierre.maziere@gmx.com'
diff --git a/modules/aum/backend.py b/modules/aum/backend.py
index 75627120cb0d779057cf3b1f40f397356de1edec..3777d2c16ccce556268a8fee79b232ef22c28b3b 100644
--- a/modules/aum/backend.py
+++ b/modules/aum/backend.py
@@ -28,11 +28,11 @@
from dateutil.parser import parse as _parse_dt
from weboob.capabilities.base import NotLoaded
-from weboob.capabilities.chat import ICapChat
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Message, Thread
-from weboob.capabilities.dating import ICapDating, OptimizationNotFound, Event
-from weboob.capabilities.contact import ICapContact, ContactPhoto, Query, QueryError
-from weboob.capabilities.account import ICapAccount, StatusField
+from weboob.capabilities.chat import CapChat
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message, Thread
+from weboob.capabilities.dating import CapDating, OptimizationNotFound, Event
+from weboob.capabilities.contact import CapContact, ContactPhoto, Query, QueryError
+from weboob.capabilities.account import CapAccount, StatusField
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.browser import BrowserUnavailable, BrowserHTTPNotFound
from weboob.tools.value import Value, ValuesDict, ValueBool, ValueBackendPassword
@@ -56,7 +56,7 @@ def parse_dt(s):
return local2utc(d)
-class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapChat, ICapContact, ICapAccount):
+class AuMBackend(BaseBackend, CapMessages, CapMessagesPost, CapDating, CapChat, CapContact, CapAccount):
NAME = 'aum'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
@@ -96,7 +96,7 @@ def report_spam(self, id):
# Do not report fakes to website, to let them to other guys :)
#self.browser.report_fake(id)
- # ---- ICapDating methods ---------------------
+ # ---- CapDating methods ---------------------
def init_optimizations(self):
self.add_optimization('PROFILE_WALKER', ProfilesWalker(self.weboob.scheduler, self.storage, self.browser))
@@ -126,7 +126,7 @@ def iter_events(self):
e.message = message % e.contact.name
yield e
- # ---- ICapMessages methods ---------------------
+ # ---- CapMessages methods ---------------------
def fill_thread(self, thread, fields):
return self.get_thread(thread)
@@ -334,13 +334,13 @@ def _get_slut(self, id):
slut['status'] = slut.get('status', None)
return slut
- # ---- ICapMessagesPost methods ---------------------
+ # ---- CapMessagesPost methods ---------------------
def post_message(self, message):
with self.browser:
self.browser.post_mail(message.thread.id, message.content)
- # ---- ICapContact methods ---------------------
+ # ---- CapContact methods ---------------------
def fill_contact(self, contact, fields):
if 'profile' in fields:
@@ -451,7 +451,7 @@ def save_notes(self, id, notes):
self.storage.set('notes', id, notes)
self.storage.save()
- # ---- ICapChat methods ---------------------
+ # ---- CapChat methods ---------------------
def iter_chat_messages(self, _id=None):
with self.browser:
@@ -464,7 +464,7 @@ def send_chat_message(self, _id, message):
#def start_chat_polling(self):
#self._profile_walker = ProfilesWalker(self.weboob.scheduler, self.storage, self.browser)
- # ---- ICapAccount methods ---------------------
+ # ---- CapAccount methods ---------------------
ACCOUNT_REGISTER_PROPERTIES = ValuesDict(
Value('username', label='Email address', regexp='^[^ ]+@[^ ]+\.[^ ]+$'),
diff --git a/modules/axabanque/backend.py b/modules/axabanque/backend.py
index 1eaa0305b2f23ba84dc3b1112dc7b5d280980075..32c562666505c0d87a2a1a35f754803065cf9069 100644
--- a/modules/axabanque/backend.py
+++ b/modules/axabanque/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -28,7 +28,7 @@
__all__ = ['AXABanqueBackend']
-class AXABanqueBackend(BaseBackend, ICapBank):
+class AXABanqueBackend(BaseBackend, CapBank):
NAME = 'axabanque'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/banqueaccord/backend.py b/modules/banqueaccord/backend.py
index 8eabb653d971c6c62cd3df8ef46d75cc364aa8a9..e94a8ab75843e3fb70679797ff63ec8e03b65389 100644
--- a/modules/banqueaccord/backend.py
+++ b/modules/banqueaccord/backend.py
@@ -19,7 +19,7 @@
from weboob.capabilities.base import find_object
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['BanqueAccordBackend']
-class BanqueAccordBackend(BaseBackend, ICapBank):
+class BanqueAccordBackend(BaseBackend, CapBank):
NAME = 'banqueaccord'
DESCRIPTION = u'Banque Accord'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/banquepopulaire/backend.py b/modules/banquepopulaire/backend.py
index 99dca429fee3c091941a99536db97dc91937eb70..817b2e4977d7dedca9360ff80fc4fe5ce9044792 100644
--- a/modules/banquepopulaire/backend.py
+++ b/modules/banquepopulaire/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import ValueBackendPassword, Value
@@ -29,7 +29,7 @@
__all__ = ['BanquePopulaireBackend']
-class BanquePopulaireBackend(BaseBackend, ICapBank):
+class BanquePopulaireBackend(BaseBackend, CapBank):
NAME = 'banquepopulaire'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/barclays/backend.py b/modules/barclays/backend.py
index c57fdaec7ebdff97537a895888a787e47dd85b21..f84bbe697100fd893cf08bfc6b4ea43c04a56f26 100644
--- a/modules/barclays/backend.py
+++ b/modules/barclays/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -28,7 +28,7 @@
__all__ = ['BarclaysBackend']
-class BarclaysBackend(BaseBackend, ICapBank):
+class BarclaysBackend(BaseBackend, CapBank):
NAME = 'barclays'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/biplan/backend.py b/modules/biplan/backend.py
index a6c2c590045a622ea4308305faf7168105b9e96d..9d11bfe7c72572db3e7e094c38017d0e48ef966b 100644
--- a/modules/biplan/backend.py
+++ b/modules/biplan/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.calendar import ICapCalendarEvent, CATEGORIES
+from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES
import itertools
from .browser import BiplanBrowser
@@ -28,7 +28,7 @@
__all__ = ['BiplanBackend']
-class BiplanBackend(BaseBackend, ICapCalendarEvent):
+class BiplanBackend(BaseBackend, CapCalendarEvent):
NAME = 'biplan'
DESCRIPTION = u'lebiplan.org website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/bnporc/backend.py b/modules/bnporc/backend.py
index 622cb76015b87b9e76864edd0ee579ba6880dccd..328c6e6b37080c7f6a736018f72d138fce67264c 100644
--- a/modules/bnporc/backend.py
+++ b/modules/bnporc/backend.py
@@ -21,8 +21,8 @@
from decimal import Decimal
from datetime import datetime, timedelta
-from weboob.capabilities.bank import ICapBank, AccountNotFound, Account, Recipient
-from weboob.capabilities.messages import ICapMessages, Thread
+from weboob.capabilities.bank import CapBank, AccountNotFound, Account, Recipient
+from weboob.capabilities.messages import CapMessages, Thread
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -33,7 +33,7 @@
__all__ = ['BNPorcBackend']
-class BNPorcBackend(BaseBackend, ICapBank, ICapMessages):
+class BNPorcBackend(BaseBackend, CapBank, CapMessages):
NAME = 'bnporc'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/boursorama/backend.py b/modules/boursorama/backend.py
index 5fb5c5ab743a41576310460e549cd991f3cef52f..b16d22cdd1a90a53dcffbc193db249ea20ea23b2 100644
--- a/modules/boursorama/backend.py
+++ b/modules/boursorama/backend.py
@@ -20,7 +20,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, ValueBool, Value
@@ -30,7 +30,7 @@
__all__ = ['BoursoramaBackend']
-class BoursoramaBackend(BaseBackend, ICapBank):
+class BoursoramaBackend(BaseBackend, CapBank):
NAME = 'boursorama'
MAINTAINER = u'Gabriel Kerneis'
EMAIL = 'gabriel@kerneis.info'
diff --git a/modules/bouygues/backend.py b/modules/bouygues/backend.py
index 2b4aad6aba68fd2033e891f83b74ee4ebf652d3c..dced523926ed777557eb9749a9f0cdac1a73daa8 100644
--- a/modules/bouygues/backend.py
+++ b/modules/bouygues/backend.py
@@ -20,7 +20,7 @@
-from weboob.capabilities.messages import CantSendMessage, ICapMessages, ICapMessagesPost
+from weboob.capabilities.messages import CantSendMessage, CapMessages, CapMessagesPost
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -30,7 +30,7 @@
__all__ = ['BouyguesBackend']
-class BouyguesBackend(BaseBackend, ICapMessages, ICapMessagesPost):
+class BouyguesBackend(BaseBackend, CapMessages, CapMessagesPost):
NAME = 'bouygues'
MAINTAINER = u'Christophe Benz'
EMAIL = 'christophe.benz@gmail.com'
diff --git a/modules/bp/backend.py b/modules/bp/backend.py
index 7ec45106febf02d835e9c4ce83ee38c0c6361f69..bc65a1c29ac8583e1c5068ecce06853aa706a2dd 100644
--- a/modules/bp/backend.py
+++ b/modules/bp/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, Account
+from weboob.capabilities.bank import CapBank, Account
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -28,7 +28,7 @@
__all__ = ['BPBackend']
-class BPBackend(BaseBackend, ICapBank):
+class BPBackend(BaseBackend, CapBank):
NAME = 'bp'
MAINTAINER = u'Nicolas Duhamel'
EMAIL = 'nicolas@jombi.fr'
diff --git a/modules/bred/backend.py b/modules/bred/backend.py
index b716e7b8c4e1123a7ef9bdc21c6180f1ce2c7276..92b4573efa9d91966e73fa279103f43c1144e78e 100644
--- a/modules/bred/backend.py
+++ b/modules/bred/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -29,7 +29,7 @@
__all__ = ['BredBackend']
-class BredBackend(BaseBackend, ICapBank):
+class BredBackend(BaseBackend, CapBank):
NAME = 'bred'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/btdigg/backend.py b/modules/btdigg/backend.py
index fc59ed796862ce18171f680172ec6bd48fb986c7..f9bf9b79e3b27e523abfd989fa15df4872517e2d 100644
--- a/modules/btdigg/backend.py
+++ b/modules/btdigg/backend.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-from weboob.capabilities.torrent import ICapTorrent
+from weboob.capabilities.torrent import CapTorrent
from weboob.tools.backend import BaseBackend
from .browser import BTDiggBrowser
@@ -8,7 +8,7 @@
__all__ = ['BTDiggBackend']
-class BTDiggBackend(BaseBackend, ICapTorrent):
+class BTDiggBackend(BaseBackend, CapTorrent):
NAME = 'btdigg'
MAINTAINER = u'Matthieu Rakotojaona'
EMAIL = 'matthieu.rakotojaona@gmail.com'
diff --git a/modules/btmon/backend.py b/modules/btmon/backend.py
index fbbba57479715e56391b32d586217f2dd3ee6379..9d03e11f82000863debc6a44546246bc15bda205 100644
--- a/modules/btmon/backend.py
+++ b/modules/btmon/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.torrent import ICapTorrent, Torrent
+from weboob.capabilities.torrent import CapTorrent, Torrent
from weboob.tools.backend import BaseBackend
from .browser import BtmonBrowser
@@ -27,7 +27,7 @@
__all__ = ['BtmonBackend']
-class BtmonBackend(BaseBackend, ICapTorrent):
+class BtmonBackend(BaseBackend, CapTorrent):
NAME = 'btmon'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/caissedepargne/backend.py b/modules/caissedepargne/backend.py
index 2415166c7817c94787994bf562cb49bbc9944d12..20d5bc7a8c2a63c4d15867dbab4dd49c30f4b39b 100644
--- a/modules/caissedepargne/backend.py
+++ b/modules/caissedepargne/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value, ValueBackendPassword
@@ -28,7 +28,7 @@
__all__ = ['CaisseEpargneBackend']
-class CaisseEpargneBackend(BaseBackend, ICapBank):
+class CaisseEpargneBackend(BaseBackend, CapBank):
NAME = 'caissedepargne'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/canalplus/backend.py b/modules/canalplus/backend.py
index 76a571c66d8c0c231bd9e3e26f5dad5e6187e70d..a89ffe3e53a16a33707aa67e7e49c1c1717d27fe 100644
--- a/modules/canalplus/backend.py
+++ b/modules/canalplus/backend.py
@@ -19,20 +19,20 @@
import re
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value
from .browser import CanalplusBrowser
from .video import CanalplusVideo
-from weboob.capabilities.collection import ICapCollection
+from weboob.capabilities.collection import CapCollection
__all__ = ['CanalplusBackend']
-class CanalplusBackend(BaseBackend, ICapVideo, ICapCollection):
+class CanalplusBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'canalplus'
MAINTAINER = u'Nicolas Duhamel'
EMAIL = 'nicolas@jombi.fr'
@@ -45,7 +45,7 @@ class CanalplusBackend(BaseBackend, ICapVideo, ICapCollection):
def create_default_browser(self):
return self.create_browser(quality=self.config['quality'].get())
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
with self.browser:
return self.browser.search_videos(pattern)
diff --git a/modules/canaltp/backend.py b/modules/canaltp/backend.py
index 1c23aa01195ea55fb3f2e260dd42795c1d3208a5..dc5b424c748b7217983478ff559a47d762039f90 100644
--- a/modules/canaltp/backend.py
+++ b/modules/canaltp/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.travel import ICapTravel, Station, Departure
+from weboob.capabilities.travel import CapTravel, Station, Departure
from weboob.tools.backend import BaseBackend
from .browser import CanalTP
@@ -26,7 +26,7 @@
__all__ = ['CanalTPBackend']
-class CanalTPBackend(BaseBackend, ICapTravel):
+class CanalTPBackend(BaseBackend, CapTravel):
NAME = 'canaltp'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/cappedtv/backend.py b/modules/cappedtv/backend.py
index 536ce4259e40b9933f7dcd94d9e0e584a7dd7c44..3f6c3c174c174705abf5f7cabc5242819526b8aa 100644
--- a/modules/cappedtv/backend.py
+++ b/modules/cappedtv/backend.py
@@ -10,8 +10,8 @@
-from weboob.capabilities.video import ICapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.video import CapVideo, BaseVideo
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from weboob.tools.backend import BaseBackend
from .browser import CappedBrowser, CappedVideo
@@ -19,7 +19,7 @@
__all__ = ['CappedBackend']
-class CappedBackend(BaseBackend, ICapVideo, ICapCollection):
+class CappedBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'cappedtv'
MAINTAINER = u'Lord'
EMAIL = 'lord@lordtoniok.com'
@@ -32,7 +32,7 @@ def get_video(self, _id):
with self.browser:
return self.browser.get_video(_id)
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=None):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=None):
with self.browser:
return self.browser.search_videos(pattern)
diff --git a/modules/carrefourbanque/backend.py b/modules/carrefourbanque/backend.py
index 04c64db83fbbbedbfc64b933f46c67d978e87c9b..f8b54f61bca0ea03e83060701d32417a6e0b47fc 100644
--- a/modules/carrefourbanque/backend.py
+++ b/modules/carrefourbanque/backend.py
@@ -19,7 +19,7 @@
from weboob.capabilities.base import find_object
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['CarrefourBanqueBackend']
-class CarrefourBanqueBackend(BaseBackend, ICapBank):
+class CarrefourBanqueBackend(BaseBackend, CapBank):
NAME = 'carrefourbanque'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/cci/backend.py b/modules/cci/backend.py
index c70b403015afc2179f00b75700bf39d605ef6ed9..6d74c9ed15ffb32e7f97e78ee6e40a84be406b61 100644
--- a/modules/cci/backend.py
+++ b/modules/cci/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.job import ICapJob, BaseJobAdvert
+from weboob.capabilities.job import CapJob, BaseJobAdvert
from weboob.tools.value import Value
from .browser import CciBrowser
@@ -28,7 +28,7 @@
__all__ = ['CciBackend']
-class CciBackend(BaseBackend, ICapJob):
+class CciBackend(BaseBackend, CapJob):
NAME = 'cci'
DESCRIPTION = u'cci website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/champslibres/backend.py b/modules/champslibres/backend.py
index 73a267902e9aae61126ed688153e8c6f30a8f42d..9de34231869deb0efc7e02c7a7fbe6e39a4a5314 100644
--- a/modules/champslibres/backend.py
+++ b/modules/champslibres/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.library import ICapBook
+from weboob.capabilities.library import CapBook
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -28,7 +28,7 @@
__all__ = ['ChampslibresBackend']
-class ChampslibresBackend(BaseBackend, ICapBook):
+class ChampslibresBackend(BaseBackend, CapBook):
NAME = 'champslibres'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/chronopost/backend.py b/modules/chronopost/backend.py
index c45a1fc46c3acb746e22b2ce885de8189a5dda6f..4afb488b4f9925588b146e99e0ddd452ca4fa4c0 100644
--- a/modules/chronopost/backend.py
+++ b/modules/chronopost/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.parcel import ICapParcel
+from weboob.capabilities.parcel import CapParcel
from weboob.tools.backend import BaseBackend
from .browser import ChronopostBrowser
@@ -27,7 +27,7 @@
__all__ = ['ChronopostBackend']
-class ChronopostBackend(BaseBackend, ICapParcel):
+class ChronopostBackend(BaseBackend, CapParcel):
NAME = 'chronopost'
DESCRIPTION = u'Chronopost website'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/cic/backend.py b/modules/cic/backend.py
index 4ae661683de6afe0691cb61dfa1d5fe926096a9f..a9c36b44ed8f97ddec31f5bd9d0c181e3ffb5216 100644
--- a/modules/cic/backend.py
+++ b/modules/cic/backend.py
@@ -22,7 +22,7 @@
from decimal import Decimal
import string
-from weboob.capabilities.bank import ICapBank, AccountNotFound, Recipient, Account
+from weboob.capabilities.bank import CapBank, AccountNotFound, Recipient, Account
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -32,7 +32,7 @@
__all__ = ['CICBackend']
-class CICBackend(BaseBackend, ICapBank):
+class CICBackend(BaseBackend, CapBank):
NAME = 'cic'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/citelis/backend.py b/modules/citelis/backend.py
index b9ca86487aaeee877f6a8359281bfe702ebdfeed..46dbfdd35d5c5f0673f0c85b1c4f2cdbd117a4ee 100644
--- a/modules/citelis/backend.py
+++ b/modules/citelis/backend.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from .browser import CitelisBrowser
@@ -28,7 +28,7 @@
__all__ = ['CitelisBackend']
-class CitelisBackend(BaseBackend, ICapBank):
+class CitelisBackend(BaseBackend, CapBank):
NAME = 'citelis'
DESCRIPTION = u'Citélis'
MAINTAINER = u'Laurent Bachelier'
diff --git a/modules/cmb/backend.py b/modules/cmb/backend.py
index 7afca160bed7244ba394902dee87ba949f14eec5..a0ca1542d467ffae5b5cb830bff7c1e77fb53050 100644
--- a/modules/cmb/backend.py
+++ b/modules/cmb/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.capabilities.bank import Account, Transaction
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -36,7 +36,7 @@
__all__ = ['CmbBackend']
-class CmbBackend(BaseBackend, ICapBank):
+class CmbBackend(BaseBackend, CapBank):
NAME = 'cmb'
MAINTAINER = u'Johann Broudin'
EMAIL = 'Johann.Broudin@6-8.fr'
diff --git a/modules/cmso/backend.py b/modules/cmso/backend.py
index 4070bce3f29d308e1d05d148e3e2e21210319b36..e408996a958fce720c703a4b28d450844e00e6b3 100644
--- a/modules/cmso/backend.py
+++ b/modules/cmso/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -28,7 +28,7 @@
__all__ = ['CmsoBackend']
-class CmsoBackend(BaseBackend, ICapBank):
+class CmsoBackend(BaseBackend, CapBank):
NAME = 'cmso'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/colisprive/backend.py b/modules/colisprive/backend.py
index fea374be161907966676a6b979547c3073c6eb92..c5b680c81ba294e6d72c7e7b322829b535513203 100644
--- a/modules/colisprive/backend.py
+++ b/modules/colisprive/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.parcel import ICapParcel
+from weboob.capabilities.parcel import CapParcel
from weboob.tools.backend import BaseBackend
from .browser import ColispriveBrowser
@@ -25,7 +25,7 @@
__all__ = ['ColispriveBackend']
-class ColispriveBackend(BaseBackend, ICapParcel):
+class ColispriveBackend(BaseBackend, CapParcel):
NAME = 'colisprive'
DESCRIPTION = u'Colisprive parcel tracking website'
MAINTAINER = u'Florent Fourcot'
diff --git a/modules/colissimo/backend.py b/modules/colissimo/backend.py
index 2a71af9b3eaf3f2a0fd9bd0ec4bfa184e03d9506..2519be9db6c694d25a29305b11306f8b961e00f3 100644
--- a/modules/colissimo/backend.py
+++ b/modules/colissimo/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.parcel import ICapParcel, Parcel, Event
+from weboob.capabilities.parcel import CapParcel, Parcel, Event
from weboob.capabilities.base import UserError
from weboob.tools.backend import BaseBackend
@@ -27,7 +27,7 @@
__all__ = ['ColissimoBackend']
-class ColissimoBackend(BaseBackend, ICapParcel):
+class ColissimoBackend(BaseBackend, CapParcel):
NAME = 'colissimo'
DESCRIPTION = u'Colissimo parcel tracking website'
MAINTAINER = u'Florent Fourcot'
diff --git a/modules/cragr/backend.py b/modules/cragr/backend.py
index adc6c9d5856534919dd8f17097c00b082d4cdf50..f5a71b5dfa5a34fe54bdbd42600f3ea1c42d6a5d 100644
--- a/modules/cragr/backend.py
+++ b/modules/cragr/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import ValueBackendPassword, Value
@@ -30,7 +30,7 @@
__all__ = ['CragrBackend']
-class CragrBackend(BaseBackend, ICapBank):
+class CragrBackend(BaseBackend, CapBank):
NAME = 'cragr'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/creditcooperatif/backend.py b/modules/creditcooperatif/backend.py
index b8b1e2629126a37a5a190b755268a5f881d3057a..cf471f39437143132573cf92edd49617c15d98c5 100644
--- a/modules/creditcooperatif/backend.py
+++ b/modules/creditcooperatif/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -29,7 +29,7 @@
__all__ = ['CreditCooperatifBackend']
-class CreditCooperatifBackend(BaseBackend, ICapBank):
+class CreditCooperatifBackend(BaseBackend, CapBank):
NAME = 'creditcooperatif'
MAINTAINER = u'Kevin Pouget'
EMAIL = 'weboob@kevin.pouget.me'
diff --git a/modules/creditdunord/backend.py b/modules/creditdunord/backend.py
index ab5d66b1302913301b6be4847e587b367a7d9f9e..d24a128e406a157e6f2bca51866637d225f0d662 100644
--- a/modules/creditdunord/backend.py
+++ b/modules/creditdunord/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import ValueBackendPassword, Value
@@ -30,7 +30,7 @@
__all__ = ['CreditDuNordBackend']
-class CreditDuNordBackend(BaseBackend, ICapBank):
+class CreditDuNordBackend(BaseBackend, CapBank):
NAME = 'creditdunord'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/creditmutuel/backend.py b/modules/creditmutuel/backend.py
index 62324344ad5f5cf6737246c84c5eda87dbc3b544..111651f75baf45c84b1050d13aee106f553ece90 100644
--- a/modules/creditmutuel/backend.py
+++ b/modules/creditmutuel/backend.py
@@ -23,7 +23,7 @@
from decimal import Decimal
import string
-from weboob.capabilities.bank import ICapBank, AccountNotFound, Recipient, Account
+from weboob.capabilities.bank import CapBank, AccountNotFound, Recipient, Account
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -33,7 +33,7 @@
__all__ = ['CreditMutuelBackend']
-class CreditMutuelBackend(BaseBackend, ICapBank):
+class CreditMutuelBackend(BaseBackend, CapBank):
NAME = 'creditmutuel'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/cuisineaz/backend.py b/modules/cuisineaz/backend.py
index d0b03cd1c51b2be8401960492c63cfc0713cfa20..1d72a9e3c74eb5442563dfff87e4cec35c20b21b 100644
--- a/modules/cuisineaz/backend.py
+++ b/modules/cuisineaz/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.recipe import ICapRecipe, Recipe
+from weboob.capabilities.recipe import CapRecipe, Recipe
from weboob.tools.backend import BaseBackend
from .browser import CuisineazBrowser
@@ -30,7 +30,7 @@ def strip_accents(s):
return ''.join(c for c in unicodedata.normalize('NFD', s) if unicodedata.category(c) != 'Mn')
-class CuisineazBackend(BaseBackend, ICapRecipe):
+class CuisineazBackend(BaseBackend, CapRecipe):
NAME = 'cuisineaz'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/dailymotion/backend.py b/modules/dailymotion/backend.py
index 141eb188a09948f2404abf1db2dd26e7705bd055..ec5e867f2dba46f3feca525385c93375c48cbfd4 100644
--- a/modules/dailymotion/backend.py
+++ b/modules/dailymotion/backend.py
@@ -17,8 +17,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.video import ICapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.video import CapVideo, BaseVideo
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from weboob.tools.backend import BaseBackend
from .browser import DailymotionBrowser
@@ -28,7 +28,7 @@
__all__ = ['DailymotionBackend']
-class DailymotionBackend(BaseBackend, ICapVideo, ICapCollection):
+class DailymotionBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'dailymotion'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
@@ -43,7 +43,7 @@ def get_video(self, _id):
SORTBY = ['relevance', 'rated', 'visited', None]
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
with self.browser:
return self.browser.search_videos(pattern, self.SORTBY[sortby])
diff --git a/modules/delubac/backend.py b/modules/delubac/backend.py
index b1c7cb8f8e233c77623e6b46bc2ac6cd86ef2723..ede2f14bf6c833f5fc303b4f0b30a996fe8ca168 100644
--- a/modules/delubac/backend.py
+++ b/modules/delubac/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank
+from weboob.capabilities.bank import CapBank
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -27,7 +27,7 @@
__all__ = ['DelubacBackend']
-class DelubacBackend(BaseBackend, ICapBank):
+class DelubacBackend(BaseBackend, CapBank):
NAME = 'delubac'
DESCRIPTION = u'Banque Delubac & Cie'
MAINTAINER = u'Noe Rubinstein'
diff --git a/modules/dlfp/backend.py b/modules/dlfp/backend.py
index b58fd3cfb3ef58ca110f03c65094ecaff136f06d..f62a8811924615e55e23960d461b4a1d55e088c3 100644
--- a/modules/dlfp/backend.py
+++ b/modules/dlfp/backend.py
@@ -27,8 +27,8 @@
from weboob.tools.browser import BrowserForbidden
from weboob.tools.newsfeed import Newsfeed
from weboob.tools.value import Value, ValueBool, ValueBackendPassword
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Message, Thread, CantSendMessage
-from weboob.capabilities.content import ICapContent, Content
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message, Thread, CantSendMessage
+from weboob.capabilities.content import CapContent, Content
from .browser import DLFP
from .tools import rssid, id2url
@@ -37,7 +37,7 @@
__all__ = ['DLFPBackend']
-class DLFPBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapContent):
+class DLFPBackend(BaseBackend, CapMessages, CapMessagesPost, CapContent):
NAME = 'dlfp'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
@@ -79,7 +79,7 @@ def deinit(self):
with self.browser:
self.browser.close_session()
- #### ICapMessages ##############################################
+ #### CapMessages ##############################################
def iter_threads(self):
whats = set()
@@ -221,7 +221,7 @@ def set_message_read(self, message):
def fill_thread(self, thread, fields, getseen=True):
return self.get_thread(thread, getseen)
- #### ICapMessagesReply #########################################
+ #### CapMessagesReply #########################################
def post_message(self, message):
if not self.browser.username:
raise BrowserForbidden()
@@ -236,7 +236,7 @@ def post_message(self, message):
message.title,
message.content)
- #### ICapContent ###############################################
+ #### CapContent ###############################################
def get_content(self, _id, revision=None):
if isinstance(_id, basestring):
content = Content(_id)
diff --git a/modules/dresdenwetter/backend.py b/modules/dresdenwetter/backend.py
index 75ea8bc3a8529ccf669a0990d94b0bff4f7def03..8f0aa0ce360eb4123bbaf82d74b44595997030a2 100644
--- a/modules/dresdenwetter/backend.py
+++ b/modules/dresdenwetter/backend.py
@@ -19,7 +19,7 @@
from .browser import DresdenWetterBrowser
-from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge,\
+from weboob.capabilities.gauge import CapGauge, GaugeSensor, Gauge,\
SensorNotFound
from weboob.capabilities.base import find_object
from weboob.tools.backend import BaseBackend
@@ -28,7 +28,7 @@
__all__ = ['DresdenWetterBackend']
-class DresdenWetterBackend(BaseBackend, ICapGauge):
+class DresdenWetterBackend(BaseBackend, CapGauge):
NAME = 'dresdenwetter'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/ebonics/backend.py b/modules/ebonics/backend.py
index 65b2da2305c9f1506a9a428c433d6eb070d54f30..4cc2eedcfc851aa501573d86878b92e853420376 100644
--- a/modules/ebonics/backend.py
+++ b/modules/ebonics/backend.py
@@ -20,7 +20,7 @@
import urllib
-from weboob.capabilities.translate import ICapTranslate, Translation, TranslationFail, LanguageNotSupported
+from weboob.capabilities.translate import CapTranslate, Translation, TranslationFail, LanguageNotSupported
from weboob.tools.backend import BaseBackend
from weboob.tools.browser import StandardBrowser
@@ -28,7 +28,7 @@
__all__ = ['EbonicsBackend']
-class EbonicsBackend(BaseBackend, ICapTranslate):
+class EbonicsBackend(BaseBackend, CapTranslate):
NAME = 'ebonics'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/edf/backend.py b/modules/edf/backend.py
index e0bf3d2868cc37cf0619518d7745ff0961834990..13d9e92f3874a3f452146fdf95da5f3c2f73d5c6 100644
--- a/modules/edf/backend.py
+++ b/modules/edf/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.bill import ICapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill
+from weboob.capabilities.bill import CapBill, SubscriptionNotFound, BillNotFound, Subscription, Bill
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
from .browser import EdfBrowser
@@ -25,7 +25,7 @@
__all__ = ['EdfBackend']
-class EdfBackend(BaseBackend, ICapBill):
+class EdfBackend(BaseBackend, CapBill):
NAME = 'edf'
DESCRIPTION = u'Edf website: French power provider'
MAINTAINER = u'Christophe Gouiran'
diff --git a/modules/ehentai/backend.py b/modules/ehentai/backend.py
index c38cd757fca53dcb10994a7858cad2f9f18d8973..5472391dd9c3e07293f48f63b75b8962c6d37ba5 100644
--- a/modules/ehentai/backend.py
+++ b/modules/ehentai/backend.py
@@ -20,8 +20,8 @@
import re
-from weboob.capabilities.gallery import ICapGallery, BaseGallery
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.gallery import CapGallery, BaseGallery
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.misc import ratelimit
from weboob.tools.value import Value, ValueBackendPassword
@@ -33,7 +33,7 @@
__all__ = ['EHentaiBackend']
-class EHentaiBackend(BaseBackend, ICapGallery, ICapCollection):
+class EHentaiBackend(BaseBackend, CapGallery, CapCollection):
NAME = 'ehentai'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
diff --git a/modules/europarl/backend.py b/modules/europarl/backend.py
index 6598183ab6f63adf791e9bf74238e69e67d8ee8d..b4204d0575ceefa4417c994a6a6915098640ab5b 100644
--- a/modules/europarl/backend.py
+++ b/modules/europarl/backend.py
@@ -21,9 +21,9 @@
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from .browser import EuroparlBrowser
from .video import EuroparlVideo
@@ -32,7 +32,7 @@
__all__ = ['EuroparlBackend']
-class EuroparlBackend(BaseBackend, ICapVideo, ICapCollection):
+class EuroparlBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'europarl'
MAINTAINER = u'François Revol'
EMAIL = 'revol@free.fr'
@@ -47,7 +47,7 @@ def get_video(self, _id):
SORTBY = ['relevance', 'rating', 'views', 'time']
- # def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ # def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
# with self.browser:
# return self.browser.search_videos(pattern, self.SORTBY[sortby])
diff --git a/modules/feedly/backend.py b/modules/feedly/backend.py
index b898185985e77c82515180374037c9366fafa08e..aad30c4d830c54ecc18b71c8b061d93a6e9d6e9f 100644
--- a/modules/feedly/backend.py
+++ b/modules/feedly/backend.py
@@ -19,8 +19,8 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.collection import ICapCollection
-from weboob.capabilities.messages import ICapMessages, Message, Thread
+from weboob.capabilities.collection import CapCollection
+from weboob.capabilities.messages import CapMessages, Message, Thread
from weboob.tools.value import Value, ValueBackendPassword
from .browser import FeedlyBrowser
@@ -29,7 +29,7 @@
__all__ = ['FeedlyBackend']
-class FeedlyBackend(BaseBackend, ICapMessages, ICapCollection):
+class FeedlyBackend(BaseBackend, CapMessages, CapCollection):
NAME = 'feedly'
DESCRIPTION = u'handle the popular RSS reading service Feedly'
MAINTAINER = u'Bezleputh'
diff --git a/modules/fortuneo/backend.py b/modules/fortuneo/backend.py
index 9f08aed925e97edc0565ac03b42713869e9b272b..863cdd2d86382d54ad586b64639506705ad717f3 100644
--- a/modules/fortuneo/backend.py
+++ b/modules/fortuneo/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -28,7 +28,7 @@
__all__ = ['FortuneoBackend']
-class FortuneoBackend(BaseBackend, ICapBank):
+class FortuneoBackend(BaseBackend, CapBank):
NAME = 'fortuneo'
MAINTAINER = u'Gilles-Alexandre Quenot'
EMAIL = 'gilles.quenot@gmail.com'
diff --git a/modules/fourchan/backend.py b/modules/fourchan/backend.py
index fda3ff8f40134045e74de1daf11fdecad783c606..a48bf237b391d4840e0c7bf950983d2b6d9b3a6c 100644
--- a/modules/fourchan/backend.py
+++ b/modules/fourchan/backend.py
@@ -20,7 +20,7 @@
-from weboob.capabilities.messages import ICapMessages, Message, Thread
+from weboob.capabilities.messages import CapMessages, Message, Thread
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value
@@ -30,7 +30,7 @@
__all__ = ['FourChanBackend']
-class FourChanBackend(BaseBackend, ICapMessages):
+class FourChanBackend(BaseBackend, CapMessages):
NAME = 'fourchan'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/francetelevisions/backend.py b/modules/francetelevisions/backend.py
index 29e046518690774d78e8223caa3e7b0bdfec7ebe..43cab5f4b4bc14513a8e41245618d25f1dc818dc 100644
--- a/modules/francetelevisions/backend.py
+++ b/modules/francetelevisions/backend.py
@@ -18,8 +18,8 @@
# along with weboob. If not, see .
-from weboob.capabilities.video import ICapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.video import CapVideo, BaseVideo
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from weboob.tools.backend import BaseBackend
from .browser import PluzzBrowser
@@ -28,7 +28,7 @@
__all__ = ['PluzzBackend']
-class PluzzBackend(BaseBackend, ICapVideo, ICapCollection):
+class PluzzBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'francetelevisions'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
@@ -40,7 +40,7 @@ class PluzzBackend(BaseBackend, ICapVideo, ICapCollection):
def get_video(self, _id):
return self.browser.get_video(_id)
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
return self.browser.search_videos(pattern)
def fill_video(self, video, fields):
diff --git a/modules/freemobile/backend.py b/modules/freemobile/backend.py
index 7c77f6d3ec3e8e3f12f31c0b2d8ae4c72df32c8b..31793c116e297c379a024713d0e32ce89d0f8f90 100644
--- a/modules/freemobile/backend.py
+++ b/modules/freemobile/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.bill import ICapBill, Subscription, Bill, SubscriptionNotFound, BillNotFound
+from weboob.capabilities.bill import CapBill, Subscription, Bill, SubscriptionNotFound, BillNotFound
from weboob.capabilities.base import find_object
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -28,7 +28,7 @@
__all__ = ['FreeMobileBackend']
-class FreeMobileBackend(BaseBackend, ICapBill):
+class FreeMobileBackend(BaseBackend, CapBill):
NAME = 'freemobile'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/ganassurances/backend.py b/modules/ganassurances/backend.py
index 1bb8ab2c155cc106529f20f8da556d0f6d69ec38..c39e6092c5783e7a294944b92c1e7fe9861daf7a 100644
--- a/modules/ganassurances/backend.py
+++ b/modules/ganassurances/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import ValueBackendPassword, Value
@@ -29,7 +29,7 @@
__all__ = ['GanAssurancesBackend']
-class GanAssurancesBackend(BaseBackend, ICapBank):
+class GanAssurancesBackend(BaseBackend, CapBank):
NAME = 'ganassurances'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/gazelle/backend.py b/modules/gazelle/backend.py
index 49293cdb437b05df6d7381d8c8fe70d4f10931e7..a132b2359788b82fff0b0eba88870f18aa0c520e 100644
--- a/modules/gazelle/backend.py
+++ b/modules/gazelle/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.torrent import ICapTorrent
+from weboob.capabilities.torrent import CapTorrent
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -27,7 +27,7 @@
__all__ = ['GazelleBackend']
-class GazelleBackend(BaseBackend, ICapTorrent):
+class GazelleBackend(BaseBackend, CapTorrent):
NAME = 'gazelle'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/gdcvault/backend.py b/modules/gdcvault/backend.py
index 667621fd5b57cba67a3488f49011cb881698587e..ea6ea2ef8376e38a3776530c9be96cb0477135d0 100644
--- a/modules/gdcvault/backend.py
+++ b/modules/gdcvault/backend.py
@@ -21,9 +21,9 @@
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from weboob.tools.value import Value, ValueBackendPassword
from .browser import GDCVaultBrowser
@@ -33,7 +33,7 @@
__all__ = ['GDCVaultBackend']
-class GDCVaultBackend(BaseBackend, ICapVideo, ICapCollection):
+class GDCVaultBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'gdcvault'
MAINTAINER = u'François Revol'
EMAIL = 'revol@free.fr'
@@ -66,7 +66,7 @@ def get_video(self, _id):
SORTBY = ['relevance', 'rating', 'views', 'time']
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
with self.browser:
return self.browser.search_videos(pattern, self.SORTBY[sortby])
diff --git a/modules/gdfsuez/backend.py b/modules/gdfsuez/backend.py
index 86e4c32ee9b1c2383f576be9b9e47edf33929ffa..9efedfe34b99ec772df82643aad7eeaaf914827f 100644
--- a/modules/gdfsuez/backend.py
+++ b/modules/gdfsuez/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.bill import ICapBill, SubscriptionNotFound,\
+from weboob.capabilities.bill import CapBill, SubscriptionNotFound,\
BillNotFound, Subscription, Bill
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -26,7 +26,7 @@
__all__ = ['GdfSuezBackend']
-class GdfSuezBackend(BaseBackend, ICapBill):
+class GdfSuezBackend(BaseBackend, CapBill):
NAME = 'gdfsuez'
MAINTAINER = u'Mathieu Jourdan'
EMAIL = 'mathieu.jourdan@gresille.org'
diff --git a/modules/geolocip/backend.py b/modules/geolocip/backend.py
index 19f2da12dff78e0eaf238ff5d461df552317a083..085374531aa9253d232045c525e3758bcde3ac5f 100644
--- a/modules/geolocip/backend.py
+++ b/modules/geolocip/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.geolocip import ICapGeolocIp, IpLocation
+from weboob.capabilities.geolocip import CapGeolocIp, IpLocation
from weboob.tools.backend import BaseBackend
from weboob.tools.browser import BaseBrowser, BrowserUnavailable
@@ -27,7 +27,7 @@
__all__ = ['GeolocIpBackend']
-class GeolocIpBackend(BaseBackend, ICapGeolocIp):
+class GeolocIpBackend(BaseBackend, CapGeolocIp):
NAME = 'geolocip'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/github/backend.py b/modules/github/backend.py
index 1fba0dbacf62a4521f99ba8aa07d6603eacda83c..79a8b90c55b8717a44c44997d9c4be6bc0a11753 100644
--- a/modules/github/backend.py
+++ b/modules/github/backend.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value, ValueBackendPassword
-from weboob.capabilities.bugtracker import ICapBugTracker, Issue, Project, User, Version, Status, Update, Attachment
+from weboob.capabilities.bugtracker import CapBugTracker, Issue, Project, User, Version, Status, Update, Attachment
from .browser import GithubBrowser
@@ -32,7 +32,7 @@
'closed': Status('closed', u'closed', Status.VALUE_RESOLVED)}
# TODO tentatively parse github "labels"?
-class GithubBackend(BaseBackend, ICapBugTracker):
+class GithubBackend(BaseBackend, CapBugTracker):
NAME = 'github'
DESCRIPTION = u'GitHub issues tracking'
MAINTAINER = u'Vincent A'
diff --git a/modules/googletranslate/backend.py b/modules/googletranslate/backend.py
index 59319185c82ee47441cd3ed58ec6b8c6a2d0c1f6..3f5358ca76b4db20da4cadcf952e4e4098546fc0 100644
--- a/modules/googletranslate/backend.py
+++ b/modules/googletranslate/backend.py
@@ -19,7 +19,7 @@
"backend for http://translate.google.com"
-from weboob.capabilities.translate import ICapTranslate, Translation, TranslationFail, LanguageNotSupported
+from weboob.capabilities.translate import CapTranslate, Translation, TranslationFail, LanguageNotSupported
from weboob.tools.backend import BaseBackend
from .browser import GoogleTranslateBrowser
@@ -28,7 +28,7 @@
__all__ = ['GoogleTranslateBackend']
-class GoogleTranslateBackend(BaseBackend, ICapTranslate):
+class GoogleTranslateBackend(BaseBackend, CapTranslate):
MAINTAINER = u'Lucien Loiseau'
EMAIL = 'loiseau.lucien@gmail.com'
VERSION = '0.j'
diff --git a/modules/grooveshark/backend.py b/modules/grooveshark/backend.py
index 3791c14c2dacabe4adb35de99ac7cb25ca1e4fa3..379dcdbbaf27dcbb672fbb5e718e8f8a3ec0b7cb 100644
--- a/modules/grooveshark/backend.py
+++ b/modules/grooveshark/backend.py
@@ -19,8 +19,8 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.audio import ICapAudio, BaseAudio, Album, Playlist, decode_id
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.audio import CapAudio, BaseAudio, Album, Playlist, decode_id
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from .browser import GroovesharkBrowser
from weboob.tools.value import ValueBackendPassword, Value
@@ -35,7 +35,7 @@ def cmp_id(p1, p2):
return -1
-class GroovesharkBackend(BaseBackend, ICapAudio, ICapCollection):
+class GroovesharkBackend(BaseBackend, CapAudio, CapCollection):
NAME = 'grooveshark'
DESCRIPTION = u'Grooveshark music streaming website'
MAINTAINER = u'Bezleputh'
@@ -63,7 +63,7 @@ def fill_audio(self, audio, fields):
with self.browser:
audio.thumbnail.data = self.browser.readurl(audio.thumbnail.url)
- def search_audio(self, pattern, sortby=ICapAudio.SEARCH_RELEVANCE):
+ def search_audio(self, pattern, sortby=CapAudio.SEARCH_RELEVANCE):
with self.browser:
return self.browser.search_audio(pattern)
@@ -78,7 +78,7 @@ def fill_album(self, album, fields):
for song in self.browser.get_all_songs_from_album(_id):
album.tracks_list.append(song)
- def search_album(self, pattern, sortby=ICapAudio.SEARCH_RELEVANCE):
+ def search_album(self, pattern, sortby=CapAudio.SEARCH_RELEVANCE):
with self.browser:
return self.browser.search_albums(pattern)
@@ -99,7 +99,7 @@ def fill_playlist(self, playlist, fields):
for song in self.browser.get_all_songs_from_playlist(_id):
playlist.tracks_list.append(song)
- def search_playlist(self, pattern, sortby=ICapAudio.SEARCH_RELEVANCE):
+ def search_playlist(self, pattern, sortby=CapAudio.SEARCH_RELEVANCE):
with self.browser:
lower_pattern = pattern.lower()
for playlist in self.browser.get_all_user_playlists():
diff --git a/modules/groupamaes/backend.py b/modules/groupamaes/backend.py
index f19784375f0a5f88ee0a3016661cc3ffb48a39ae..0f020cd5036d186977ad189588e9f1c761cc2e1e 100644
--- a/modules/groupamaes/backend.py
+++ b/modules/groupamaes/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
from weboob.capabilities.base import find_object
@@ -28,7 +28,7 @@
__all__ = ['GroupamaesBackend']
-class GroupamaesBackend(BaseBackend, ICapBank):
+class GroupamaesBackend(BaseBackend, CapBank):
NAME = 'groupamaes'
DESCRIPTION = u"Groupama Épargne Salariale"
MAINTAINER = u'Bezleputh'
diff --git a/modules/guerrillamail/backend.py b/modules/guerrillamail/backend.py
index c0e7606172f32fe85f58598854a276c1259a1e96..3d463ffcbeec172dc76dc61dcde8c4e5e31678bf 100644
--- a/modules/guerrillamail/backend.py
+++ b/modules/guerrillamail/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Thread, Message
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Thread, Message
from weboob.tools.value import Value
from .browser import GuerrillamailBrowser
@@ -28,7 +28,7 @@
__all__ = ['GuerrillamailBackend']
-class GuerrillamailBackend(BaseBackend, ICapMessages, ICapMessagesPost):
+class GuerrillamailBackend(BaseBackend, CapMessages, CapMessagesPost):
NAME = 'guerrillamail'
DESCRIPTION = u'GuerrillaMail temp mailbox'
MAINTAINER = u'Vincent A'
diff --git a/modules/hds/backend.py b/modules/hds/backend.py
index 045510df8d41872549f5ad2f434ded240f9adc55..240cfc1949cf6c42dfae7eb18e4f4676fa9f515e 100644
--- a/modules/hds/backend.py
+++ b/modules/hds/backend.py
@@ -21,7 +21,7 @@
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.messages import ICapMessages, Message, Thread
+from weboob.capabilities.messages import CapMessages, Message, Thread
from .browser import HDSBrowser
@@ -29,7 +29,7 @@
__all__ = ['HDSBackend']
-class HDSBackend(BaseBackend, ICapMessages):
+class HDSBackend(BaseBackend, CapMessages):
NAME = 'hds'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
@@ -39,7 +39,7 @@ class HDSBackend(BaseBackend, ICapMessages):
STORAGE = {'seen': []}
BROWSER = HDSBrowser
- #### ICapMessages ##############################################
+ #### CapMessages ##############################################
def iter_threads(self):
with self.browser:
diff --git a/modules/hellobank/backend.py b/modules/hellobank/backend.py
index 74d190e64288daf72d8a82174dfdc0041af708f9..9304d988378d0cc058d0aad4e5886afe6e1fe936 100644
--- a/modules/hellobank/backend.py
+++ b/modules/hellobank/backend.py
@@ -22,8 +22,8 @@
from decimal import Decimal
from datetime import datetime, timedelta
-from weboob.capabilities.bank import ICapBank, AccountNotFound, Account, Recipient
-from weboob.capabilities.messages import ICapMessages, Thread
+from weboob.capabilities.bank import CapBank, AccountNotFound, Account, Recipient
+from weboob.capabilities.messages import CapMessages, Thread
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -33,7 +33,7 @@
__all__ = ['HelloBankBackend']
-class HelloBankBackend(BaseBackend, ICapBank, ICapMessages):
+class HelloBankBackend(BaseBackend, CapBank, CapMessages):
NAME = 'hellobank'
MAINTAINER = u'Christophe Lampin'
EMAIL = 'weboob@lampin.net'
diff --git a/modules/hsbc/backend.py b/modules/hsbc/backend.py
index 748f60c35304c7c821d56b5d392fde9af4e8579a..66d1fca0d409737aef08c1eb228cfe6e0ce18408 100644
--- a/modules/hsbc/backend.py
+++ b/modules/hsbc/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.capabilities.base import find_object
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -30,7 +30,7 @@
__all__ = ['HSBCBackend']
-class HSBCBackend(BaseBackend, ICapBank):
+class HSBCBackend(BaseBackend, CapBank):
NAME = 'hsbc'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/hybride/backend.py b/modules/hybride/backend.py
index 9d5862f7fc8dc906463426130c8f893f21961409..399516e4222e7d822ff7738aa264363346c388c4 100644
--- a/modules/hybride/backend.py
+++ b/modules/hybride/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.calendar import ICapCalendarEvent, CATEGORIES
+from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES
from .browser import HybrideBrowser
from .calendar import HybrideCalendarEvent
@@ -27,7 +27,7 @@
__all__ = ['HybrideBackend']
-class HybrideBackend(BaseBackend, ICapCalendarEvent):
+class HybrideBackend(BaseBackend, CapCalendarEvent):
NAME = 'hybride'
DESCRIPTION = u'hybride website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/imdb/backend.py b/modules/imdb/backend.py
index 1245f41a1a83ff56ece4da44e1db68e5564f65e7..31c7389e41be4c54d3640280f061091ea369cb81 100644
--- a/modules/imdb/backend.py
+++ b/modules/imdb/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.cinema import ICapCinema, Person, Movie
+from weboob.capabilities.cinema import CapCinema, Person, Movie
from weboob.tools.backend import BaseBackend
from .browser import ImdbBrowser
@@ -27,7 +27,7 @@
__all__ = ['ImdbBackend']
-class ImdbBackend(BaseBackend, ICapCinema):
+class ImdbBackend(BaseBackend, CapCinema):
NAME = 'imdb'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/imgur/backend.py b/modules/imgur/backend.py
index 48ef42d64fe72d478a78f6ac75c63953fb519dde..6787f34f0d254fb77419c295118a719bff029140 100644
--- a/modules/imgur/backend.py
+++ b/modules/imgur/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.paste import ICapPaste, BasePaste
+from weboob.capabilities.paste import CapPaste, BasePaste
from weboob.tools.capabilities.paste import image_mime
from weboob.capabilities.base import StringField
from weboob.tools.browser import StandardBrowser
@@ -43,7 +43,7 @@ def raw_url(self):
return 'http://i.imgur.com/%s.png' % self.id
-class ImgurBackend(BaseBackend, ICapPaste):
+class ImgurBackend(BaseBackend, CapPaste):
NAME = 'imgur'
DESCRIPTION = u'imgur image upload service'
MAINTAINER = u'Vincent A'
diff --git a/modules/ina/backend.py b/modules/ina/backend.py
index 6c2735e26bc0d6120c72fd0829f28af56c9ba079..4ed4d9b0a801e13aef983c2efc2d622c8e706efb 100644
--- a/modules/ina/backend.py
+++ b/modules/ina/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.video import ICapVideo
+from weboob.capabilities.video import CapVideo
from weboob.tools.backend import BaseBackend
from .browser import InaBrowser
@@ -28,7 +28,7 @@
__all__ = ['InaBackend']
-class InaBackend(BaseBackend, ICapVideo):
+class InaBackend(BaseBackend, CapVideo):
NAME = 'ina'
MAINTAINER = u'Christophe Benz'
EMAIL = 'christophe.benz@gmail.com'
@@ -40,7 +40,7 @@ class InaBackend(BaseBackend, ICapVideo):
def get_video(self, _id):
return self.browser.get_video(_id)
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
with self.browser:
return self.browser.search_videos(pattern)
diff --git a/modules/indeed/backend.py b/modules/indeed/backend.py
index 75adb0b7c5055b6f5589f63294f1791e4fd974e6..da48a3a9db4d07eb2308c3dc2113eb78c9c335f3 100644
--- a/modules/indeed/backend.py
+++ b/modules/indeed/backend.py
@@ -20,14 +20,14 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.ordereddict import OrderedDict
-from weboob.capabilities.job import ICapJob, BaseJobAdvert
+from weboob.capabilities.job import CapJob, BaseJobAdvert
from weboob.tools.value import Value
from .browser import IndeedBrowser
__all__ = ['IndeedBackend']
-class IndeedBackend(BaseBackend, ICapJob):
+class IndeedBackend(BaseBackend, CapJob):
NAME = 'indeed'
DESCRIPTION = u'indeed website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/ing/backend.py b/modules/ing/backend.py
index e09c77ba19161c04d7a3aeffe01ba062b7d10b84..6cf94b9280fde12887536603b6bda35d423ce144 100644
--- a/modules/ing/backend.py
+++ b/modules/ing/backend.py
@@ -18,9 +18,9 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound,\
+from weboob.capabilities.bank import CapBank, AccountNotFound,\
Account, Recipient
-from weboob.capabilities.bill import ICapBill, Bill, Subscription,\
+from weboob.capabilities.bill import CapBill, Bill, Subscription,\
SubscriptionNotFound, BillNotFound
from weboob.capabilities.base import UserError, find_object
from weboob.tools.backend import BaseBackend, BackendConfig
@@ -31,7 +31,7 @@
__all__ = ['INGBackend']
-class INGBackend(BaseBackend, ICapBank, ICapBill):
+class INGBackend(BaseBackend, CapBank, CapBill):
NAME = 'ing'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/inrocks/backend.py b/modules/inrocks/backend.py
index 1d3dacc810aebc952739f3788d3e11b78d4c3908..b116669f92d90ccacb6ead1707310646a64a1693 100644
--- a/modules/inrocks/backend.py
+++ b/modules/inrocks/backend.py
@@ -18,13 +18,13 @@
# along with weboob. If not, see .
"backend for http://www.lesinrocks.com"
-from weboob.capabilities.messages import ICapMessages
+from weboob.capabilities.messages import CapMessages
from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
from .browser import NewspaperInrocksBrowser
from .tools import rssid
-class NewspaperInrocksBackend(GenericNewspaperBackend, ICapMessages):
+class NewspaperInrocksBackend(GenericNewspaperBackend, CapMessages):
MAINTAINER = u'Julien Hebert'
EMAIL = 'juke@free.fr'
VERSION = '0.j'
diff --git a/modules/ipinfodb/backend.py b/modules/ipinfodb/backend.py
index 4d5af4db000d6d3ea0ab22b19091674cd34ff81a..4f991341a87de747d5955b08e96e80ffbc7cb71c 100644
--- a/modules/ipinfodb/backend.py
+++ b/modules/ipinfodb/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.geolocip import ICapGeolocIp, IpLocation
+from weboob.capabilities.geolocip import CapGeolocIp, IpLocation
from weboob.tools.backend import BaseBackend
from weboob.tools.browser import StandardBrowser
@@ -27,7 +27,7 @@
__all__ = ['IpinfodbBackend']
-class IpinfodbBackend(BaseBackend, ICapGeolocIp):
+class IpinfodbBackend(BaseBackend, CapGeolocIp):
NAME = 'ipinfodb'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/izneo/backend.py b/modules/izneo/backend.py
index 02fe3e65e0660487d3fa870648f6bf0eff2e9378..a4b8ac78e0516b75696281b1c8655402c7db40c1 100644
--- a/modules/izneo/backend.py
+++ b/modules/izneo/backend.py
@@ -21,7 +21,7 @@
import re
-from weboob.capabilities.gallery import ICapGallery, BaseGallery, BaseImage
+from weboob.capabilities.gallery import CapGallery, BaseGallery, BaseImage
from weboob.tools.json import json
from weboob.tools.backend import BaseBackend
from weboob.tools.browser import BaseBrowser, BasePage
@@ -61,7 +61,7 @@ def fill_image(self, image, fields):
image.url, None, {'Referer': image.gallery.url}))
-class IzneoBackend(BaseBackend, ICapGallery):
+class IzneoBackend(BaseBackend, CapGallery):
NAME = 'izneo'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
diff --git a/modules/jacquieetmichel/backend.py b/modules/jacquieetmichel/backend.py
index 088b82063e141f077b3ba2d9539091f23d1dc825..058038fd995ddd2a9ce231a9b913f9621e8efcb9 100644
--- a/modules/jacquieetmichel/backend.py
+++ b/modules/jacquieetmichel/backend.py
@@ -17,8 +17,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.video import ICapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.video import CapVideo, BaseVideo
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from weboob.tools.backend import BaseBackend
from .browser import JacquieEtMichelBrowser
@@ -28,7 +28,7 @@
__all__ = ['JacquieEtMichelBackend']
-class JacquieEtMichelBackend(BaseBackend, ICapVideo, ICapCollection):
+class JacquieEtMichelBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'jacquieetmichel'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
@@ -42,7 +42,7 @@ def get_video(self, _id):
video = self.browser.get_video(_id)
return video
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
if not nsfw:
return iter([])
diff --git a/modules/jcvelaux/backend.py b/modules/jcvelaux/backend.py
index a6f86e4cf8fff7aca91fa26223d9d80d18451720..566c61f689add206b1f48111154fe605d69cc882 100644
--- a/modules/jcvelaux/backend.py
+++ b/modules/jcvelaux/backend.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.capabilities.base import StringField
-from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge, GaugeMeasure, SensorNotFound
+from weboob.capabilities.gauge import CapGauge, GaugeSensor, Gauge, GaugeMeasure, SensorNotFound
from weboob.tools.value import Value
from weboob.tools.ordereddict import OrderedDict
@@ -51,7 +51,7 @@ class BikeSensor(GaugeSensor):
latitude = StringField('Latitude of the sensor')
-class jcvelauxBackend(BaseBackend, ICapGauge):
+class jcvelauxBackend(BaseBackend, CapGauge):
NAME = 'jcvelaux'
DESCRIPTION = (u'City bike renting availability information.\nCities: %s' %
u', '.join(CITIES))
diff --git a/modules/jvmalin/backend.py b/modules/jvmalin/backend.py
index a41e6da965c1f055d49f682e605c0559d0371fd9..8a970d445681d00a6ae424acbbda450dddc642df 100644
--- a/modules/jvmalin/backend.py
+++ b/modules/jvmalin/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.travel import ICapTravel, RoadStep
+from weboob.capabilities.travel import CapTravel, RoadStep
from weboob.tools.backend import BaseBackend
from .browser import JVMalin
@@ -26,7 +26,7 @@
__all__ = ['JVMalinBackend']
-class JVMalinBackend(BaseBackend, ICapTravel):
+class JVMalinBackend(BaseBackend, CapTravel):
NAME = 'jvmalin'
MAINTAINER = u'Alexandre Lissy'
EMAIL = 'github@lissy.me'
diff --git a/modules/kickass/backend.py b/modules/kickass/backend.py
index 7fb7d9d44321a0c53d1871b7fdbe727769b7701d..abb1f812c6a2b6c2b9bdaf3b6799de6d00b40387 100644
--- a/modules/kickass/backend.py
+++ b/modules/kickass/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.torrent import ICapTorrent, Torrent
+from weboob.capabilities.torrent import CapTorrent, Torrent
from weboob.tools.backend import BaseBackend
from .browser import KickassBrowser
@@ -29,7 +29,7 @@
__all__ = ['KickassBackend']
-class KickassBackend(BaseBackend, ICapTorrent):
+class KickassBackend(BaseBackend, CapTorrent):
NAME = 'kickass'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/lacentrale/backend.py b/modules/lacentrale/backend.py
index b7cd98aa821de5966e685591b075356054efb563..383e01be4dd1e073a5a5d95362c889a7e2a1cd7c 100644
--- a/modules/lacentrale/backend.py
+++ b/modules/lacentrale/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
import re
-from weboob.capabilities.pricecomparison import ICapPriceComparison, Price
+from weboob.capabilities.pricecomparison import CapPriceComparison, Price
from weboob.tools.backend import BaseBackend
#from weboob.tools.value import Value
@@ -29,7 +29,7 @@
# I implement capability
-class LaCentraleBackend(BaseBackend, ICapPriceComparison):
+class LaCentraleBackend(BaseBackend, CapPriceComparison):
NAME = 'lacentrale'
MAINTAINER = u'Vicnet'
EMAIL = 'vo.publique@gmail.com'
@@ -38,7 +38,7 @@ class LaCentraleBackend(BaseBackend, ICapPriceComparison):
LICENSE = 'AGPLv3+'
BROWSER = LaCentraleBrowser
- # inherited from ICapPriceComparison
+ # inherited from CapPriceComparison
def search_products(self, patternString=None):
# convert pattern to criteria
criteria = {}
@@ -67,13 +67,13 @@ def search_products(self, patternString=None):
for product in self.browser.iter_products(criteria):
yield product
- # inherited from ICapPriceComparison
+ # inherited from CapPriceComparison
def iter_prices(self, product):
- # inherited from ICapPriceComparison
+ # inherited from CapPriceComparison
with self.browser:
return self.browser.iter_prices(product)
- # inherited from ICapPriceComparison
+ # inherited from CapPriceComparison
def get_price(self, id):
# id is a url code part for one car page
with self.browser:
diff --git a/modules/lcl/backend.py b/modules/lcl/backend.py
index 7a6b5b3c9897a812cd842054b782f53989199aee..3c6d76e69239aa3c873de238bba7b0d2da7a566b 100644
--- a/modules/lcl/backend.py
+++ b/modules/lcl/backend.py
@@ -20,7 +20,7 @@
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -31,7 +31,7 @@
__all__ = ['LCLBackend']
-class LCLBackend(BaseBackend, ICapBank):
+class LCLBackend(BaseBackend, CapBank):
NAME = 'lcl'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/leclercmobile/backend.py b/modules/leclercmobile/backend.py
index 8158e4870c7a3c3f93a3919aace20361d6a9a312..df3da11ba2ed983508d5e91c83e8ca2e606a4cac 100644
--- a/modules/leclercmobile/backend.py
+++ b/modules/leclercmobile/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bill import ICapBill, SubscriptionNotFound,\
+from weboob.capabilities.bill import CapBill, SubscriptionNotFound,\
BillNotFound, Subscription, Bill
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['LeclercMobileBackend']
-class LeclercMobileBackend(BaseBackend, ICapBill):
+class LeclercMobileBackend(BaseBackend, CapBill):
NAME = 'leclercmobile'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/lefigaro/backend.py b/modules/lefigaro/backend.py
index 73916e99050637047827eb116aac60e5a96f22a6..70a4bfc484524ad7fcbc0c51d1e27d2353e01b13 100644
--- a/modules/lefigaro/backend.py
+++ b/modules/lefigaro/backend.py
@@ -18,13 +18,13 @@
# along with weboob. If not, see .
"backend for http://www.lefigaro.fr"
-from weboob.capabilities.messages import ICapMessages
+from weboob.capabilities.messages import CapMessages
from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
from .browser import NewspaperFigaroBrowser
from .tools import rssid
-class NewspaperFigaroBackend(GenericNewspaperBackend, ICapMessages):
+class NewspaperFigaroBackend(GenericNewspaperBackend, CapMessages):
MAINTAINER = u'Julien Hebert'
EMAIL = 'juke@free.fr'
VERSION = '0.j'
diff --git a/modules/liberation/backend.py b/modules/liberation/backend.py
index c157476d7fd9fe8ab388fe2e0518b91886649872..9fcf08a4991bd143d64744749796a20646600e1b 100644
--- a/modules/liberation/backend.py
+++ b/modules/liberation/backend.py
@@ -19,7 +19,7 @@
"backend for http://liberation.fr"
from weboob.tools.newsfeed import Newsfeed
-from weboob.capabilities.messages import ICapMessages, Thread
+from weboob.capabilities.messages import CapMessages, Thread
from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
from weboob.tools.backend import BackendConfig
from weboob.tools.value import Value
@@ -27,7 +27,7 @@
from .tools import rssid, url2id
-class NewspaperLibeBackend(GenericNewspaperBackend, ICapMessages):
+class NewspaperLibeBackend(GenericNewspaperBackend, CapMessages):
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
VERSION = '0.j'
diff --git a/modules/lolix/backend.py b/modules/lolix/backend.py
index 95a2e892f1f3e96166f2bc9d5a0116312162efe1..4f0094cc246810863c991e19ed30edfc71f51f8f 100644
--- a/modules/lolix/backend.py
+++ b/modules/lolix/backend.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import Value
-from weboob.capabilities.job import ICapJob
+from weboob.capabilities.job import CapJob
from .browser import LolixBrowser
from .job import LolixJobAdvert
@@ -28,7 +28,7 @@
__all__ = ['LolixBackend']
-class LolixBackend(BaseBackend, ICapJob):
+class LolixBackend(BaseBackend, CapJob):
NAME = 'lolix'
DESCRIPTION = u'Lolix French free software employment website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/lutim/backend.py b/modules/lutim/backend.py
index 0566ecc28ede71aee87de1e7b76004407c5b3d61..76515a8ca6c18a17f93de38e1247f9e1cf786bca 100644
--- a/modules/lutim/backend.py
+++ b/modules/lutim/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.paste import ICapPaste, BasePaste
+from weboob.capabilities.paste import CapPaste, BasePaste
from weboob.tools.capabilities.paste import image_mime
from weboob.tools.value import Value
import re
@@ -31,7 +31,7 @@
__all__ = ['LutimBackend']
-class LutimBackend(BaseBackend, ICapPaste):
+class LutimBackend(BaseBackend, CapPaste):
NAME = 'lutim'
DESCRIPTION = u'LUTIm website'
MAINTAINER = u'Vincent A'
diff --git a/modules/mailinator/backend.py b/modules/mailinator/backend.py
index f5e930e7bc5113ae6ddb5ffa74a67ecd48a37d8b..12ff0947c668f0184a1faf1c6487760a9ceb00c4 100644
--- a/modules/mailinator/backend.py
+++ b/modules/mailinator/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.messages import ICapMessages, Thread, Message
+from weboob.capabilities.messages import CapMessages, Thread, Message
from weboob.tools.value import Value
from .browser import MailinatorBrowser
@@ -30,7 +30,7 @@
# There is only one thread per inbox, and the thread id is the inbox name
# TODO but this can lead to bans if there are too many messages...
-class MailinatorBackend(BaseBackend, ICapMessages):
+class MailinatorBackend(BaseBackend, CapMessages):
NAME = 'mailinator'
DESCRIPTION = u'mailinator temp mailbox'
MAINTAINER = u'Vincent A'
diff --git a/modules/marmiton/backend.py b/modules/marmiton/backend.py
index 04355389b07264d5f5e90e36685ab21c13ef89fd..404771c2eb5fbb263d2ef60969687ad89857f50d 100644
--- a/modules/marmiton/backend.py
+++ b/modules/marmiton/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.recipe import ICapRecipe, Recipe
+from weboob.capabilities.recipe import CapRecipe, Recipe
from weboob.tools.backend import BaseBackend
from .browser import MarmitonBrowser
@@ -27,7 +27,7 @@
__all__ = ['MarmitonBackend']
-class MarmitonBackend(BaseBackend, ICapRecipe):
+class MarmitonBackend(BaseBackend, CapRecipe):
NAME = 'marmiton'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/mediawiki/backend.py b/modules/mediawiki/backend.py
index 58adac919f805a0426c54fa14034e6c7728f8082..4ba7ecc15bad53269c5eb3d8c8036fa2e4963067 100644
--- a/modules/mediawiki/backend.py
+++ b/modules/mediawiki/backend.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.content import ICapContent, Content
+from weboob.capabilities.content import CapContent, Content
from weboob.tools.value import ValueBackendPassword, Value
@@ -30,7 +30,7 @@
__all__ = ['MediawikiBackend']
-class MediawikiBackend(BaseBackend, ICapContent):
+class MediawikiBackend(BaseBackend, CapContent):
NAME = 'mediawiki'
MAINTAINER = u'Clément Schreiner'
EMAIL = 'clemux@clemux.info'
diff --git a/modules/meteofrance/backend.py b/modules/meteofrance/backend.py
index c2cda913d6e8bab541a26c50dd884e501538c15f..793237893e3d7e8931496073d0220cc8619eb698 100644
--- a/modules/meteofrance/backend.py
+++ b/modules/meteofrance/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.weather import ICapWeather
+from weboob.capabilities.weather import CapWeather
from weboob.tools.backend import BaseBackend
from .browser import MeteofranceBrowser
@@ -27,7 +27,7 @@
__all__ = ['MeteofranceBackend']
-class MeteofranceBackend(BaseBackend, ICapWeather):
+class MeteofranceBackend(BaseBackend, CapWeather):
NAME = 'meteofrance'
MAINTAINER = u'Cedric Defortis'
EMAIL = 'cedric@aiur.fr'
diff --git a/modules/minutes20/backend.py b/modules/minutes20/backend.py
index 335d473b0bace71761923e5e73d7ffe0e615735b..f714a8f01e949dd4017da0217616bfba9e1bc17a 100644
--- a/modules/minutes20/backend.py
+++ b/modules/minutes20/backend.py
@@ -18,13 +18,13 @@
# along with weboob. If not, see .
"backend for http://20minutes.fr"
-from weboob.capabilities.messages import ICapMessages
+from weboob.capabilities.messages import CapMessages
from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
from .browser import Newspaper20minutesBrowser
from .tools import rssid
-class Newspaper20minutesBackend(GenericNewspaperBackend, ICapMessages):
+class Newspaper20minutesBackend(GenericNewspaperBackend, CapMessages):
MAINTAINER = u'Julien Hebert'
EMAIL = 'juke@free.fr'
VERSION = '0.j'
diff --git a/modules/monster/backend.py b/modules/monster/backend.py
index 4be8a3250b104076f649b47d998b4d40d82fa071..adf4dac4ab8c9202a2d59c0487743f0818abc596 100644
--- a/modules/monster/backend.py
+++ b/modules/monster/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.job import ICapJob
+from weboob.capabilities.job import CapJob
from weboob.tools.value import Value
from weboob.tools.ordereddict import OrderedDict
@@ -29,7 +29,7 @@
__all__ = ['MonsterBackend']
-class MonsterBackend(BaseBackend, ICapJob):
+class MonsterBackend(BaseBackend, CapJob):
NAME = 'monster'
DESCRIPTION = u'monster website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/nectarine/backend.py b/modules/nectarine/backend.py
index 8c1f9cc0eed0b3a2850625d3e324c55632a12051..62e6e0f71c438e02c0d03601f88866ac53f0b1d4 100644
--- a/modules/nectarine/backend.py
+++ b/modules/nectarine/backend.py
@@ -16,14 +16,14 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.radio import ICapRadio, Radio
-from weboob.capabilities.collection import ICapCollection
+from weboob.capabilities.radio import CapRadio, Radio
+from weboob.capabilities.collection import CapCollection
from weboob.tools.backend import BaseBackend
from .browser import NectarineBrowser
__all__ = ['NectarineBackend']
-class NectarineBackend(BaseBackend, ICapRadio, ICapCollection):
+class NectarineBackend(BaseBackend, CapRadio, CapCollection):
NAME = 'nectarine'
MAINTAINER = u'Thomas Lecavelier'
EMAIL = 'thomas-weboob@lecavelier.name'
diff --git a/modules/nettokom/backend.py b/modules/nettokom/backend.py
index 42a799f797d0de7b137ca04e53a0bc5e184d0c9e..ff15c6533bc4b5bb0db1a9fc6640260117d5c288 100644
--- a/modules/nettokom/backend.py
+++ b/modules/nettokom/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.bill import ICapBill, Subscription, SubscriptionNotFound, Detail
+from weboob.capabilities.bill import CapBill, Subscription, SubscriptionNotFound, Detail
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['NettoKomBackend']
-class NettoKomBackend(BaseBackend, ICapBill):
+class NettoKomBackend(BaseBackend, CapBill):
NAME = 'nettokom'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/newsfeed/backend.py b/modules/newsfeed/backend.py
index 7358c681cb97a87e463a367d20eff55371c10364..68a935ba3eaef88b5df3cdfa6e2338e9efa56f20 100644
--- a/modules/newsfeed/backend.py
+++ b/modules/newsfeed/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.messages import ICapMessages, Message, Thread
+from weboob.capabilities.messages import CapMessages, Message, Thread
from weboob.tools.newsfeed import Newsfeed
from weboob.tools.value import Value
@@ -27,7 +27,7 @@
__all__ = ['NewsfeedBackend']
-class NewsfeedBackend(BaseBackend, ICapMessages):
+class NewsfeedBackend(BaseBackend, CapMessages):
NAME = 'newsfeed'
MAINTAINER = u'Clément Schreiner'
EMAIL = "clemux@clemux.info"
diff --git a/modules/nihonnooto/backend.py b/modules/nihonnooto/backend.py
index 7c5167c8db697418e4d6239f8daa93397424831d..fbb00f85ccb66277e7b9e5c29e41d282bd413dba 100644
--- a/modules/nihonnooto/backend.py
+++ b/modules/nihonnooto/backend.py
@@ -16,14 +16,14 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.radio import ICapRadio, Radio
-from weboob.capabilities.collection import ICapCollection
+from weboob.capabilities.radio import CapRadio, Radio
+from weboob.capabilities.collection import CapCollection
from weboob.tools.backend import BaseBackend
from .browser import NihonNoOtoBrowser
__all__ = ['NihonNoOtoBackend']
-class NihonNoOtoBackend(BaseBackend, ICapRadio, ICapCollection):
+class NihonNoOtoBackend(BaseBackend, CapRadio, CapCollection):
NAME = 'nihonnooto'
MAINTAINER = u'Thomas Lecavelier'
EMAIL = 'thomas-weboob@lecavelier.name'
diff --git a/modules/nolifetv/backend.py b/modules/nolifetv/backend.py
index e1c32766206d52b746ce18504db21ba1a3202f2b..b0810e9eb84512ca56b7053fb286fb5b193d68b7 100644
--- a/modules/nolifetv/backend.py
+++ b/modules/nolifetv/backend.py
@@ -18,8 +18,8 @@
# along with weboob. If not, see .
-from weboob.capabilities.video import ICapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound, Collection
+from weboob.capabilities.video import CapVideo, BaseVideo
+from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection
from weboob.tools.value import Value, ValueBackendPassword
from weboob.tools.backend import BaseBackend, BackendConfig
@@ -31,7 +31,7 @@
__all__ = ['NolifeTVBackend']
-class NolifeTVBackend(BaseBackend, ICapVideo, ICapCollection):
+class NolifeTVBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'nolifetv'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
@@ -102,7 +102,7 @@ def fill_video(self, video, fields):
video.url = self.get_url(video.id, self.config['quality'].get())
return video
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
with self.browser:
return self.browser.search_videos(pattern)
diff --git a/modules/nova/backend.py b/modules/nova/backend.py
index 5d061c1fd59d30859420bc15258be35a123279d2..07d2ee50090ca2f598ebf4f0a66d0e6bbd9a3d99 100644
--- a/modules/nova/backend.py
+++ b/modules/nova/backend.py
@@ -20,10 +20,10 @@
from cStringIO import StringIO
-from weboob.capabilities.radio import ICapRadio, Radio
+from weboob.capabilities.radio import CapRadio, Radio
from weboob.capabilities.audiostream import BaseAudioStream
from weboob.tools.capabilities.streaminfo import StreamInfo
-from weboob.capabilities.collection import ICapCollection
+from weboob.capabilities.collection import CapCollection
from weboob.tools.backend import BaseBackend
from weboob.tools.browser import StandardBrowser
from weboob.tools.parsers import get_parser
@@ -32,7 +32,7 @@
__all__ = ['NovaBackend']
-class NovaBackend(BaseBackend, ICapRadio, ICapCollection):
+class NovaBackend(BaseBackend, CapRadio, CapCollection):
NAME = 'nova'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/okc/backend.py b/modules/okc/backend.py
index 791f95250402e72c4c07b86a8ed64313716ef0a0..0cca7eb472fa8a065f2d185860adee0de3d76008 100644
--- a/modules/okc/backend.py
+++ b/modules/okc/backend.py
@@ -24,9 +24,9 @@
from dateutil import tz
from dateutil.parser import parse as _parse_dt
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Message, Thread
-from weboob.capabilities.dating import ICapDating, OptimizationNotFound, Event
-from weboob.capabilities.contact import ICapContact, ContactPhoto, Contact, Query, QueryError
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message, Thread
+from weboob.capabilities.dating import CapDating, OptimizationNotFound, Event
+from weboob.capabilities.contact import CapContact, ContactPhoto, Contact, Query, QueryError
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value, ValueBackendPassword
from weboob.tools.misc import local2utc
@@ -63,7 +63,7 @@ def parse_dt(s):
return local2utc(d)
-class OkCBackend(BaseBackend, ICapMessages, ICapContact, ICapMessagesPost, ICapDating):
+class OkCBackend(BaseBackend, CapMessages, CapContact, CapMessagesPost, CapDating):
NAME = 'okc'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
@@ -82,7 +82,7 @@ class OkCBackend(BaseBackend, ICapMessages, ICapContact, ICapMessagesPost, ICapD
def create_default_browser(self):
return self.create_browser(self.config['username'].get(), self.config['password'].get())
- # ---- ICapDating methods ---------------------
+ # ---- CapDating methods ---------------------
def init_optimizations(self):
self.add_optimization('PROFILE_WALKER', ProfilesWalker(self.weboob.scheduler, self.storage, self.browser))
@@ -107,7 +107,7 @@ def iter_events(self):
# e.message = message % e.contact.name
yield e
- # ---- ICapMessages methods ---------------------
+ # ---- CapMessages methods ---------------------
def fill_thread(self, thread, fields):
return self.get_thread(thread)
@@ -227,7 +227,7 @@ def _get_slut(self, id):
slut['lastmsg'] = slut.get('lastmsg', datetime.datetime(1970,1,1)).replace(tzinfo=tz.tzutc())
return slut
- # ---- ICapMessagesPost methods ---------------------
+ # ---- CapMessagesPost methods ---------------------
def post_message(self, message):
content = message.content.replace('\n', '\r\n').encode('utf-8', 'replace')
@@ -241,7 +241,7 @@ def post_message(self, message):
else:
self.browser.post_mail(message.thread.id, content)
- # ---- ICapContact methods ---------------------
+ # ---- CapContact methods ---------------------
def fill_contact(self, contact, fields):
if 'profile' in fields:
diff --git a/modules/oney/backend.py b/modules/oney/backend.py
index 12c4251f66fe93e46669c45f65fe2cb87170d125..af0c03ba174bd63161df2d3b35e79e0551ba04f6 100644
--- a/modules/oney/backend.py
+++ b/modules/oney/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.capabilities.base import find_object
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -30,7 +30,7 @@
__all__ = ['OneyBackend']
-class OneyBackend(BaseBackend, ICapBank):
+class OneyBackend(BaseBackend, CapBank):
NAME = 'oney'
MAINTAINER = u'Vincet Paredes'
EMAIL = 'vparedes@budget-insight.com'
diff --git a/modules/opacwebaloes/backend.py b/modules/opacwebaloes/backend.py
index e981e8c0cf376c87cd343b6739c2cd739a9e3f4c..4d2439f3747a6bae193789df6b250cda0124501d 100644
--- a/modules/opacwebaloes/backend.py
+++ b/modules/opacwebaloes/backend.py
@@ -20,7 +20,7 @@
-from weboob.capabilities.library import ICapBook
+from weboob.capabilities.library import CapBook
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -30,7 +30,7 @@
__all__ = ['AloesBackend']
-class AloesBackend(BaseBackend, ICapBook):
+class AloesBackend(BaseBackend, CapBook):
NAME = 'opacwebaloes'
MAINTAINER = u'Jeremy Monnet'
EMAIL = 'jmonnet@gmail.com'
diff --git a/modules/opensubtitles/backend.py b/modules/opensubtitles/backend.py
index 52f3135dd11eced661123f00b897ec0bd7711e02..e7554295073b0c8b5046310f23ab01e0f4747eef 100644
--- a/modules/opensubtitles/backend.py
+++ b/modules/opensubtitles/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.subtitle import ICapSubtitle, LanguageNotSupported, Subtitle
+from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported, Subtitle
from weboob.applications.suboob.suboob import LANGUAGE_CONV
from weboob.tools.backend import BaseBackend
@@ -28,7 +28,7 @@
__all__ = ['OpensubtitlesBackend']
-class OpensubtitlesBackend(BaseBackend, ICapSubtitle):
+class OpensubtitlesBackend(BaseBackend, CapSubtitle):
NAME = 'opensubtitles'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/orange/backend.py b/modules/orange/backend.py
index 29b1f5b16dad5440b0b88ccc862c349a1f1ce88d..873e3dda48fb56a5349ab71c3a7a5e6a3f339121 100644
--- a/modules/orange/backend.py
+++ b/modules/orange/backend.py
@@ -20,8 +20,8 @@
-from weboob.capabilities.messages import CantSendMessage, ICapMessages, ICapMessagesPost
-from weboob.capabilities.account import ICapAccount, StatusField
+from weboob.capabilities.messages import CantSendMessage, CapMessages, CapMessagesPost
+from weboob.capabilities.account import CapAccount, StatusField
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -31,7 +31,7 @@
__all__ = ['OrangeBackend']
-class OrangeBackend(BaseBackend, ICapAccount, ICapMessages, ICapMessagesPost):
+class OrangeBackend(BaseBackend, CapAccount, CapMessages, CapMessagesPost):
NAME = 'orange'
MAINTAINER = u'Nicolas Duhamel'
EMAIL = 'nicolas@jombi.fr'
diff --git a/modules/ouifm/backend.py b/modules/ouifm/backend.py
index 03430800efe0b9ba0a5a8aa53b4fca3ab161772e..c995c3f6767a4810d9e8104dfe0ae32b0bc5ad8c 100644
--- a/modules/ouifm/backend.py
+++ b/modules/ouifm/backend.py
@@ -18,10 +18,10 @@
# along with weboob. If not, see .
-from weboob.capabilities.radio import ICapRadio, Radio
+from weboob.capabilities.radio import CapRadio, Radio
from weboob.capabilities.audiostream import BaseAudioStream
from weboob.tools.capabilities.streaminfo import StreamInfo
-from weboob.capabilities.collection import ICapCollection
+from weboob.capabilities.collection import CapCollection
from weboob.tools.backend import BaseBackend
from weboob.tools.browser import StandardBrowser
from weboob.tools.misc import to_unicode
@@ -30,7 +30,7 @@
__all__ = ['OuiFMBackend']
-class OuiFMBackend(BaseBackend, ICapRadio, ICapCollection):
+class OuiFMBackend(BaseBackend, CapRadio, CapCollection):
NAME = 'ouifm'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/ovs/backend.py b/modules/ovs/backend.py
index 95eb171bf00832de1febe75e8c4f4d708d0f3b02..1dd150d652ee29dcf6d9870ae995e8a1f0334114 100644
--- a/modules/ovs/backend.py
+++ b/modules/ovs/backend.py
@@ -20,8 +20,8 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.browser import BrowserForbidden
from weboob.tools.value import Value, ValueBackendPassword
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Message
-from weboob.capabilities.contact import ICapContact
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message
+from weboob.capabilities.contact import CapContact
from .browser import OvsBrowser
@@ -60,7 +60,7 @@
u'zurich': u'Zurich'}
-class OvsBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapContact):
+class OvsBackend(BaseBackend, CapMessages, CapMessagesPost, CapContact):
NAME = 'ovs'
DESCRIPTION = u'OnVaSortir website. Handles private messages only'
MAINTAINER = u'Vincent A'
@@ -81,7 +81,7 @@ def create_default_browser(self):
self.config['password'].get(),
parser='raw')
- # ICapMessages
+ # CapMessages
def iter_threads(self):
with self.browser:
for thread in self.browser.iter_threads_list():
@@ -115,7 +115,7 @@ def set_message_read(self, message):
self.storage.set('seen', message.full_id, True)
self.storage.save()
- # ICapMessagesPost
+ # CapMessagesPost
def post_message(self, message):
if not self.browser.username:
raise BrowserForbidden()
@@ -130,11 +130,11 @@ def post_message(self, message):
# ovs.@*
self.browser.create_thread(thread.id, message.title, message.content)
- # ICapContact
+ # CapContact
def get_contact(self, id):
return self.browser.get_contact(id)
# FIXME known bug: parsing is done in "boosted mode" which is automatically disable after some time, the "boosted mode" should be re-toggled often
# TODO support outing comments, forum messages
-# TODO make an ICapOuting?
+# TODO make an CapOuting?
diff --git a/modules/pap/backend.py b/modules/pap/backend.py
index cc32de7449a900ace36cb44a00d4aa0cf26358fd..5a300f41eb92621e14519532d2b829a21a25c982 100644
--- a/modules/pap/backend.py
+++ b/modules/pap/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.housing import ICapHousing, City, Housing, HousingPhoto
+from weboob.capabilities.housing import CapHousing, City, Housing, HousingPhoto
from weboob.tools.backend import BaseBackend
from .browser import PapBrowser
@@ -28,7 +28,7 @@
__all__ = ['PapBackend']
-class PapBackend(BaseBackend, ICapHousing):
+class PapBackend(BaseBackend, CapHousing):
NAME = 'pap'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/pariskiwi/backend.py b/modules/pariskiwi/backend.py
index f0320ca86b226f46d8c96cf75f1cd6caf09ad888..65e76d5dd93f2f2e5a115c1894104392256f4429 100644
--- a/modules/pariskiwi/backend.py
+++ b/modules/pariskiwi/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.calendar import ICapCalendarEvent, BaseCalendarEvent, CATEGORIES, TRANSP, STATUS
+from weboob.capabilities.calendar import CapCalendarEvent, BaseCalendarEvent, CATEGORIES, TRANSP, STATUS
from datetime import datetime, time
from .browser import ParisKiwiBrowser
@@ -28,7 +28,7 @@
__all__ = ['ParisKiwiBackend']
-class ParisKiwiBackend(BaseBackend, ICapCalendarEvent):
+class ParisKiwiBackend(BaseBackend, CapCalendarEvent):
NAME = 'pariskiwi'
DESCRIPTION = u'ParisKiwi website'
MAINTAINER = u'Vincent A'
diff --git a/modules/parolesmania/backend.py b/modules/parolesmania/backend.py
index 468200302588e3726454c2dc1c3d5486008bf40d..405c488893c11e536726352fe1fc1349619067a1 100644
--- a/modules/parolesmania/backend.py
+++ b/modules/parolesmania/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.lyrics import ICapLyrics, SongLyrics
+from weboob.capabilities.lyrics import CapLyrics, SongLyrics
from weboob.tools.backend import BaseBackend
from .browser import ParolesmaniaBrowser
@@ -27,7 +27,7 @@
__all__ = ['ParolesmaniaBackend']
-class ParolesmaniaBackend(BaseBackend, ICapLyrics):
+class ParolesmaniaBackend(BaseBackend, CapLyrics):
NAME = 'parolesmania'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/parolesmusique/backend.py b/modules/parolesmusique/backend.py
index dafd5d2adfc39337bc350d2e85e61833fd6ed378..bbddbc4af2388b0e3772500d1e581025594ddda0 100644
--- a/modules/parolesmusique/backend.py
+++ b/modules/parolesmusique/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.lyrics import ICapLyrics, SongLyrics
+from weboob.capabilities.lyrics import CapLyrics, SongLyrics
from weboob.tools.backend import BaseBackend
from .browser import ParolesmusiqueBrowser
@@ -25,7 +25,7 @@
__all__ = ['ParolesmusiqueBackend']
-class ParolesmusiqueBackend(BaseBackend, ICapLyrics):
+class ParolesmusiqueBackend(BaseBackend, CapLyrics):
NAME = 'parolesmusique'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/parolesnet/backend.py b/modules/parolesnet/backend.py
index 838c59d28fe66f400e850790bceccc839b25f834..ebe9031d2b6225342d1839312c382c13b1e8870e 100644
--- a/modules/parolesnet/backend.py
+++ b/modules/parolesnet/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.lyrics import ICapLyrics, SongLyrics
+from weboob.capabilities.lyrics import CapLyrics, SongLyrics
from weboob.tools.backend import BaseBackend
from .browser import ParolesnetBrowser
@@ -25,7 +25,7 @@
__all__ = ['ParolesnetBackend']
-class ParolesnetBackend(BaseBackend, ICapLyrics):
+class ParolesnetBackend(BaseBackend, CapLyrics):
NAME = 'parolesnet'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/paypal/backend.py b/modules/paypal/backend.py
index ba5f83ed4f183aaa4cfc64a2293b68afb05726de..7a198c0784ee941afe8e83da2f964ef375c35355 100644
--- a/modules/paypal/backend.py
+++ b/modules/paypal/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -28,7 +28,7 @@
__all__ = ['PaypalBackend']
-class PaypalBackend(BaseBackend, ICapBank):
+class PaypalBackend(BaseBackend, CapBank):
NAME = 'paypal'
MAINTAINER = u'Laurent Bachelier'
EMAIL = 'laurent@bachelier.name'
diff --git a/modules/phpbb/backend.py b/modules/phpbb/backend.py
index 8d892dea70a2dd58d77cd1b45fd10f3685e5bb18..05cc0cdda757e0a06462fccfc0e48c80ac86b89b 100644
--- a/modules/phpbb/backend.py
+++ b/modules/phpbb/backend.py
@@ -24,7 +24,7 @@
from weboob.tools.newsfeed import Newsfeed
from weboob.tools.value import Value, ValueInt, ValueBackendPassword
from weboob.tools.misc import limit
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Message, Thread, CantSendMessage
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message, Thread, CantSendMessage
from .browser import PhpBB
from .tools import rssid, url2id, id2url, id2topic
@@ -33,7 +33,7 @@
__all__ = ['PhpBBBackend']
-class PhpBBBackend(BaseBackend, ICapMessages, ICapMessagesPost):
+class PhpBBBackend(BaseBackend, CapMessages, CapMessagesPost):
NAME = 'phpbb'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
@@ -57,7 +57,7 @@ def create_default_browser(self):
return self.create_browser(self.config['url'].get(),
username, password)
- #### ICapMessages ##############################################
+ #### CapMessages ##############################################
def _iter_threads(self, root_link=None):
with self.browser:
@@ -174,7 +174,7 @@ def set_message_read(self, message):
def fill_thread(self, thread, fields):
return self.get_thread(thread)
- #### ICapMessagesReply #########################################
+ #### CapMessagesReply #########################################
def post_message(self, message):
assert message.thread
diff --git a/modules/piratebay/backend.py b/modules/piratebay/backend.py
index a6d35819e48e6f00af14163dc56bd364c35e7fa9..b9781529563f18ed0bb260aef40f0762dd692fb1 100644
--- a/modules/piratebay/backend.py
+++ b/modules/piratebay/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.torrent import ICapTorrent, MagnetOnly, Torrent
+from weboob.capabilities.torrent import CapTorrent, MagnetOnly, Torrent
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value
from weboob.capabilities.base import NotAvailable
@@ -28,7 +28,7 @@
__all__ = ['PiratebayBackend']
-class PiratebayBackend(BaseBackend, ICapTorrent):
+class PiratebayBackend(BaseBackend, CapTorrent):
NAME = 'piratebay'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/pixtoilelibre/backend.py b/modules/pixtoilelibre/backend.py
index 78a0e81432e0e669ca9a97b2f5925d31f28a4a9b..3435745e561ce3b874a11cea06a9a7cf4b7738b0 100644
--- a/modules/pixtoilelibre/backend.py
+++ b/modules/pixtoilelibre/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.paste import ICapPaste, BasePaste
+from weboob.capabilities.paste import CapPaste, BasePaste
from weboob.tools.capabilities.paste import image_mime
import re
@@ -35,7 +35,7 @@ def id2url(cls, id):
return 'http://pix.toile-libre.org/?img=%s' % id
-class PixtoilelibreBackend(BaseBackend, ICapPaste):
+class PixtoilelibreBackend(BaseBackend, CapPaste):
NAME = 'pixtoilelibre'
DESCRIPTION = u'toile-libre image hosting website'
MAINTAINER = u'Vincent A'
diff --git a/modules/podnapisi/backend.py b/modules/podnapisi/backend.py
index cc142892ad9f058de595e51a0a848b8bc773a06c..12005e78179d1f9fedb60107c3421923d4e007a4 100644
--- a/modules/podnapisi/backend.py
+++ b/modules/podnapisi/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.subtitle import ICapSubtitle, LanguageNotSupported, Subtitle
+from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported, Subtitle
from weboob.applications.suboob.suboob import LANGUAGE_CONV
from weboob.tools.backend import BaseBackend
@@ -28,7 +28,7 @@
__all__ = ['PodnapisiBackend']
-class PodnapisiBackend(BaseBackend, ICapSubtitle):
+class PodnapisiBackend(BaseBackend, CapSubtitle):
NAME = 'podnapisi'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/poivy/backend.py b/modules/poivy/backend.py
index 6527860e838a658423b5df2c973eca64c95ec7a1..96f26b5d709b994ce8f6f3e2d9c2d0365310d6f6 100644
--- a/modules/poivy/backend.py
+++ b/modules/poivy/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bill import ICapBill, Subscription, SubscriptionNotFound, Detail
+from weboob.capabilities.bill import CapBill, Subscription, SubscriptionNotFound, Detail
from weboob.capabilities.base import find_object
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['PoivyBackend']
-class PoivyBackend(BaseBackend, ICapBill):
+class PoivyBackend(BaseBackend, CapBill):
NAME = 'poivy'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/popolemploi/backend.py b/modules/popolemploi/backend.py
index 0be02b0e0d2f0dbfb00968da3998d419760d5439..d51f83c4652f9f2d287160f03bf23ba74a23e77f 100644
--- a/modules/popolemploi/backend.py
+++ b/modules/popolemploi/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.job import ICapJob
+from weboob.capabilities.job import CapJob
from weboob.tools.value import Value
from weboob.tools.ordereddict import OrderedDict
@@ -29,7 +29,7 @@
__all__ = ['PopolemploiBackend']
-class PopolemploiBackend(BaseBackend, ICapJob):
+class PopolemploiBackend(BaseBackend, CapJob):
NAME = 'popolemploi'
DESCRIPTION = u'Pole Emploi website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/presseurop/backend.py b/modules/presseurop/backend.py
index 9b686002e2135a72925489b4cfe713637b71faec..b8d5707cdaa5a567bc9fa6e77b2629844130898f 100644
--- a/modules/presseurop/backend.py
+++ b/modules/presseurop/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
"backend for http://www.presseurop.eu"
-from weboob.capabilities.messages import ICapMessages, Thread
+from weboob.capabilities.messages import CapMessages, Thread
from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
from weboob.tools.backend import BackendConfig
from weboob.tools.value import Value
@@ -27,7 +27,7 @@
from weboob.tools.newsfeed import Newsfeed
-class NewspaperPresseuropBackend(GenericNewspaperBackend, ICapMessages):
+class NewspaperPresseuropBackend(GenericNewspaperBackend, CapMessages):
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
VERSION = '0.j'
diff --git a/modules/prixcarburants/backend.py b/modules/prixcarburants/backend.py
index ac0d9ce586fc068f19838d3b5c6f1b0ac45f601c..cb9d22181885bb063ec4c77653e19a65f9836f48 100644
--- a/modules/prixcarburants/backend.py
+++ b/modules/prixcarburants/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value
-from weboob.capabilities.pricecomparison import ICapPriceComparison, Price, Product
+from weboob.capabilities.pricecomparison import CapPriceComparison, Price, Product
from .browser import PrixCarburantsBrowser
@@ -27,7 +27,7 @@
__all__ = ['PrixCarburantsBackend']
-class PrixCarburantsBackend(BaseBackend, ICapPriceComparison):
+class PrixCarburantsBackend(BaseBackend, CapPriceComparison):
NAME = 'prixcarburants'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/quvi/backend.py b/modules/quvi/backend.py
index 6d169c528c68e4f0d914e76221655c569fa08522..b950f373d3dd2a8c57236453c9fe2cbc1bfc5a17 100644
--- a/modules/quvi/backend.py
+++ b/modules/quvi/backend.py
@@ -26,7 +26,7 @@
import datetime
from weboob.capabilities.base import UserError, StringField
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
from weboob.capabilities.image import BaseImage
from weboob.tools.backend import BaseBackend
from weboob.tools.misc import to_unicode
@@ -37,7 +37,7 @@
__all__ = ['QuviBackend', 'QuviVideo']
-class QuviBackend(BaseBackend, ICapVideo):
+class QuviBackend(BaseBackend, CapVideo):
NAME = 'quvi'
DESCRIPTION = u'Multi-website video helper with quvi. Handles Youtube, BBC, and a lot more'
MAINTAINER = u'Vincent A'
diff --git a/modules/radiofrance/backend.py b/modules/radiofrance/backend.py
index 918ef3b3f28eb7da5982e271fb91c879c5e3ceec..ac9c681ccbc0fb18599268352526256f20947274 100644
--- a/modules/radiofrance/backend.py
+++ b/modules/radiofrance/backend.py
@@ -20,11 +20,11 @@
from weboob.capabilities.base import NotLoaded
-from weboob.capabilities.video import ICapVideo
-from weboob.capabilities.radio import ICapRadio, Radio
+from weboob.capabilities.video import CapVideo
+from weboob.capabilities.radio import CapRadio, Radio
from weboob.capabilities.audiostream import BaseAudioStream
from weboob.tools.capabilities.streaminfo import StreamInfo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound, Collection
+from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection
from weboob.tools.backend import BaseBackend
from .browser import RadioFranceBrowser, RadioFranceVideo
@@ -33,7 +33,7 @@
__all__ = ['RadioFranceBackend']
-class RadioFranceBackend(BaseBackend, ICapRadio, ICapCollection, ICapVideo):
+class RadioFranceBackend(BaseBackend, CapRadio, CapCollection, CapVideo):
NAME = 'radiofrance'
MAINTAINER = u'Laurent Bachelier'
EMAIL = 'laurent@bachelier.name'
diff --git a/modules/redmine/backend.py b/modules/redmine/backend.py
index 91fb6b9832097a96e7bb80d4fe4325664e45eec0..6dcd57c362118838cac21d4b5ddcec79af91bd6d 100644
--- a/modules/redmine/backend.py
+++ b/modules/redmine/backend.py
@@ -20,11 +20,11 @@
-from weboob.capabilities.content import ICapContent, Content
-from weboob.capabilities.bugtracker import ICapBugTracker, Issue, Project, User, \
+from weboob.capabilities.content import CapContent, Content
+from weboob.capabilities.bugtracker import CapBugTracker, Issue, Project, User, \
Version, Status, Update, Attachment, \
Query, Change
-from weboob.capabilities.collection import ICapCollection, Collection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, Collection, CollectionNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.exceptions import BrowserHTTPNotFound
from weboob.tools.value import ValueBackendPassword, Value
@@ -35,7 +35,7 @@
__all__ = ['RedmineBackend']
-class RedmineBackend(BaseBackend, ICapContent, ICapBugTracker, ICapCollection):
+class RedmineBackend(BaseBackend, CapContent, CapBugTracker, CapCollection):
NAME = 'redmine'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/regionsjob/backend.py b/modules/regionsjob/backend.py
index cd7a37227fb16937358e67e55b7ede5d755fded9..d4d1e09d1c77267c6c5d385a6d66c4b2e01bb723 100644
--- a/modules/regionsjob/backend.py
+++ b/modules/regionsjob/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.job import ICapJob, BaseJobAdvert
+from weboob.capabilities.job import CapJob, BaseJobAdvert
from .browser import RegionsjobBrowser
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import Value
@@ -28,7 +28,7 @@
__all__ = ['RegionsjobBackend']
-class RegionsjobBackend(BaseBackend, ICapJob):
+class RegionsjobBackend(BaseBackend, CapJob):
NAME = 'regionsjob'
DESCRIPTION = u'regionsjob website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/sachsen/backend.py b/modules/sachsen/backend.py
index 579b5b3aa7cfca5ce0c6f71265ed99385abc50f0..782cf22eec641cc1bfe581a26fca2cc8175cd02f 100644
--- a/modules/sachsen/backend.py
+++ b/modules/sachsen/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
from .browser import SachsenBrowser
-from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge,\
+from weboob.capabilities.gauge import CapGauge, GaugeSensor, Gauge,\
SensorNotFound
from weboob.capabilities.base import find_object
from weboob.tools.backend import BaseBackend
@@ -27,7 +27,7 @@
__all__ = ['SachsenLevelBackend']
-class SachsenLevelBackend(BaseBackend, ICapGauge):
+class SachsenLevelBackend(BaseBackend, CapGauge):
NAME = 'sachsen'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/seeklyrics/backend.py b/modules/seeklyrics/backend.py
index 2847efb0f32edd11dd1218893dd0262ac233a6a5..0ab51f07290c5ba54a777ef8b4193e6df9d298e0 100644
--- a/modules/seeklyrics/backend.py
+++ b/modules/seeklyrics/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.lyrics import ICapLyrics, SongLyrics
+from weboob.capabilities.lyrics import CapLyrics, SongLyrics
from weboob.tools.backend import BaseBackend
from .browser import SeeklyricsBrowser
@@ -27,7 +27,7 @@
__all__ = ['SeeklyricsBackend']
-class SeeklyricsBackend(BaseBackend, ICapLyrics):
+class SeeklyricsBackend(BaseBackend, CapLyrics):
NAME = 'seeklyrics'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/seloger/backend.py b/modules/seloger/backend.py
index 673a7486ef3e713b2aad812b272c906dc3a2607b..c03e8f8a8415c3dbb6706873c1eb7bbd8dea9f6f 100644
--- a/modules/seloger/backend.py
+++ b/modules/seloger/backend.py
@@ -19,7 +19,7 @@
-from weboob.capabilities.housing import ICapHousing, City, Housing, HousingPhoto
+from weboob.capabilities.housing import CapHousing, City, Housing, HousingPhoto
from weboob.tools.backend import BaseBackend
from .browser import SeLogerBrowser
@@ -28,7 +28,7 @@
__all__ = ['SeLogerBackend']
-class SeLogerBackend(BaseBackend, ICapHousing):
+class SeLogerBackend(BaseBackend, CapHousing):
NAME = 'seloger'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/senscritique/backend.py b/modules/senscritique/backend.py
index d501d7266f6ba6032d266821e4a15c328dddb195..ebfbcc52646d661287b243c32e3010ccde658c1d 100644
--- a/modules/senscritique/backend.py
+++ b/modules/senscritique/backend.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import Value, ValueBool
-from weboob.capabilities.calendar import ICapCalendarEvent, CATEGORIES
+from weboob.capabilities.calendar import CapCalendarEvent, CATEGORIES
from .browser import SenscritiqueBrowser
from .calendar import SensCritiquenCalendarEvent
@@ -28,7 +28,7 @@
__all__ = ['SenscritiqueBackend']
-class SenscritiqueBackend(BaseBackend, ICapCalendarEvent):
+class SenscritiqueBackend(BaseBackend, CapCalendarEvent):
NAME = 'senscritique'
DESCRIPTION = u'senscritique website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/sfr/backend.py b/modules/sfr/backend.py
index f0cdb785e8d20e4483a7c98bd2265598f3620619..994b676df959e86c655a3db6b7f9bdceceb274d4 100644
--- a/modules/sfr/backend.py
+++ b/modules/sfr/backend.py
@@ -20,8 +20,8 @@
-from weboob.capabilities.messages import CantSendMessage, ICapMessages, ICapMessagesPost
-from weboob.capabilities.account import ICapAccount, StatusField
+from weboob.capabilities.messages import CantSendMessage, CapMessages, CapMessagesPost
+from weboob.capabilities.account import CapAccount, StatusField
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value, ValueBackendPassword
@@ -31,7 +31,7 @@
__all__ = ['SfrBackend']
-class SfrBackend(BaseBackend, ICapAccount, ICapMessages, ICapMessagesPost):
+class SfrBackend(BaseBackend, CapAccount, CapMessages, CapMessagesPost):
NAME = 'sfr'
MAINTAINER = u'Christophe Benz'
EMAIL = 'christophe.benz@gmail.com'
@@ -46,7 +46,7 @@ class SfrBackend(BaseBackend, ICapAccount, ICapMessages, ICapMessagesPost):
def create_default_browser(self):
return self.create_browser(self.config['login'].get(), self.config['password'].get())
- # ICapMessagesPost methods
+ # CapMessagesPost methods
def get_account_status(self):
with self.browser:
diff --git a/modules/societegenerale/backend.py b/modules/societegenerale/backend.py
index 7b0e4b37fb3406bd4a4e368f71cb870d7e345562..9125ad9981499a95d269bf7a4f56c9f9b87d82e9 100644
--- a/modules/societegenerale/backend.py
+++ b/modules/societegenerale/backend.py
@@ -19,7 +19,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import ICapBank, AccountNotFound
+from weboob.capabilities.bank import CapBank, AccountNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value, ValueBackendPassword
@@ -30,7 +30,7 @@
__all__ = ['SocieteGeneraleBackend']
-class SocieteGeneraleBackend(BaseBackend, ICapBank):
+class SocieteGeneraleBackend(BaseBackend, CapBank):
NAME = 'societegenerale'
MAINTAINER = u'Jocelyn Jaubert'
EMAIL = 'jocelyn.jaubert@gmail.com'
diff --git a/modules/somafm/backend.py b/modules/somafm/backend.py
index ef8a90c87589be14642a59baf1bd883ed184f9f8..89be032170db6ea026eb518deb3040905eb6dde2 100644
--- a/modules/somafm/backend.py
+++ b/modules/somafm/backend.py
@@ -19,10 +19,10 @@
import lxml.etree
-from weboob.capabilities.radio import ICapRadio, Radio
+from weboob.capabilities.radio import CapRadio, Radio
from weboob.capabilities.audiostream import BaseAudioStream
from weboob.tools.capabilities.streaminfo import StreamInfo
-from weboob.capabilities.collection import ICapCollection
+from weboob.capabilities.collection import CapCollection
from weboob.tools.backend import BaseBackend
from weboob.tools.browser import StandardBrowser
from weboob.tools.parsers.iparser import IParser
@@ -36,7 +36,7 @@ def parse(self, data, encoding=None):
return lxml.etree.fromstring(data.read())
-class SomaFMBackend(BaseBackend, ICapRadio, ICapCollection):
+class SomaFMBackend(BaseBackend, CapRadio, CapCollection):
NAME = 'somafm'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
diff --git a/modules/sueurdemetal/backend.py b/modules/sueurdemetal/backend.py
index 9fe5f808e3a17f8447f0e2542ff9762b666335ec..32cbdbe8911d79e132b170cdd46f55572e0ef634 100644
--- a/modules/sueurdemetal/backend.py
+++ b/modules/sueurdemetal/backend.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.calendar import ICapCalendarEvent, BaseCalendarEvent, CATEGORIES, TRANSP, STATUS
+from weboob.capabilities.calendar import CapCalendarEvent, BaseCalendarEvent, CATEGORIES, TRANSP, STATUS
import datetime
from .browser import SueurDeMetalBrowser
@@ -34,7 +34,7 @@ def id2url(cls, _id):
return 'http://www.sueurdemetal.com/detail-concert-metal.php?c=%s' % _id
-class SueurDeMetalBackend(BaseBackend, ICapCalendarEvent):
+class SueurDeMetalBackend(BaseBackend, CapCalendarEvent):
NAME = 'sueurdemetal'
DESCRIPTION = u'SueurDeMetal French concerts list website'
MAINTAINER = u'Vincent A'
diff --git a/modules/supertoinette/backend.py b/modules/supertoinette/backend.py
index 2a74fc76426c8e19190a112ef58831f4f38f05f8..94bb716574302317ed0d699692cf68429b6fdc34 100644
--- a/modules/supertoinette/backend.py
+++ b/modules/supertoinette/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.recipe import ICapRecipe, Recipe
+from weboob.capabilities.recipe import CapRecipe, Recipe
from weboob.tools.backend import BaseBackend
from .browser import SupertoinetteBrowser
@@ -25,7 +25,7 @@
__all__ = ['SupertoinetteBackend']
-class SupertoinetteBackend(BaseBackend, ICapRecipe):
+class SupertoinetteBackend(BaseBackend, CapRecipe):
NAME = 'supertoinette'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/taz/backend.py b/modules/taz/backend.py
index d26891d7c85e7bab65f2dc4f35bddf45b6265abc..f438b106502a1e45055117b26f51868c43142345 100644
--- a/modules/taz/backend.py
+++ b/modules/taz/backend.py
@@ -18,13 +18,13 @@
# along with weboob. If not, see .
"backend for http://www.taz.de"
-from weboob.capabilities.messages import ICapMessages
+from weboob.capabilities.messages import CapMessages
from weboob.tools.capabilities.messages.GenericBackend import GenericNewspaperBackend
from .browser import NewspaperTazBrowser
from .tools import rssid, url2id
-class NewspaperTazBackend(GenericNewspaperBackend, ICapMessages):
+class NewspaperTazBackend(GenericNewspaperBackend, CapMessages):
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
VERSION = '0.j'
diff --git a/modules/tinder/backend.py b/modules/tinder/backend.py
index 041dc597766501b40b0e1ead9239220908c4fbb3..b8082c1c0d30bdcdb76e858824f630a0882c7e80 100644
--- a/modules/tinder/backend.py
+++ b/modules/tinder/backend.py
@@ -21,8 +21,8 @@
import datetime
from dateutil.parser import parse as parse_date
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Thread, Message
-from weboob.capabilities.dating import ICapDating, Optimization
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Thread, Message
+from weboob.capabilities.dating import CapDating, Optimization
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import Value, ValueBackendPassword
from weboob.tools.log import getLogger
@@ -65,7 +65,7 @@ def view_profile(self):
self.view_cron = self.sched.schedule(1, self.view_profile)
-class TinderBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating):
+class TinderBackend(BaseBackend, CapMessages, CapMessagesPost, CapDating):
NAME = 'tinder'
DESCRIPTION = u'Tinder dating mobile application'
MAINTAINER = u'Roger Philibert'
@@ -85,12 +85,12 @@ def create_default_browser(self):
self.config['password'].get())
return TinderBrowser(facebook)
- # ---- ICapDating methods -----------------------
+ # ---- CapDating methods -----------------------
def init_optimizations(self):
self.add_optimization('PROFILE_WALKER', ProfilesWalker(self.weboob.scheduler, self.storage, self.browser))
- # ---- ICapMessages methods ---------------------
+ # ---- CapMessages methods ---------------------
def fill_thread(self, thread, fields):
return self.get_thread(thread)
@@ -157,7 +157,7 @@ def set_message_read(self, message):
self.storage.set('contacts', message.thread.id, contact)
self.storage.save()
- # ---- ICapMessagesPost methods ---------------------
+ # ---- CapMessagesPost methods ---------------------
def post_message(self, message):
self.browser.post_message(message.thread.id, message.content)
diff --git a/modules/transilien/backend.py b/modules/transilien/backend.py
index dfa17130a8eb64caee7fa235e4c28645ca5194b1..089600e184d872db253a84929532e1096e36674b 100644
--- a/modules/transilien/backend.py
+++ b/modules/transilien/backend.py
@@ -20,14 +20,14 @@
-from weboob.capabilities.travel import ICapTravel, Station, Departure, RoadStep
+from weboob.capabilities.travel import CapTravel, Station, Departure, RoadStep
from weboob.tools.backend import BaseBackend
from .browser import Transilien
from .stations import STATIONS
-class TransilienBackend(BaseBackend, ICapTravel):
+class TransilienBackend(BaseBackend, CapTravel):
NAME = 'transilien'
MAINTAINER = u'Julien Hébert'
EMAIL = 'juke@free.fr'
diff --git a/modules/trictractv/backend.py b/modules/trictractv/backend.py
index ffba8f09fefbfaa619727b2c0113b2603d0fc564..7f63018132ae161cbe295f4fd636f8621a2112fe 100644
--- a/modules/trictractv/backend.py
+++ b/modules/trictractv/backend.py
@@ -21,7 +21,7 @@
-from weboob.capabilities.video import ICapVideo
+from weboob.capabilities.video import CapVideo
from weboob.tools.backend import BaseBackend
from .browser import TricTracTVBrowser
@@ -31,7 +31,7 @@
__all__ = ['TricTracTVBackend']
-class TricTracTVBackend(BaseBackend, ICapVideo):
+class TricTracTVBackend(BaseBackend, CapVideo):
NAME = 'trictractv'
MAINTAINER = u'Benjamin Drieu'
EMAIL = 'benjamin@drieu.org'
@@ -44,7 +44,7 @@ def get_video(self, _id):
with self.browser:
return self.browser.get_video(_id)
- def search_videos(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern=None, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
with self.browser:
return self.browser.search_videos(pattern)
diff --git a/modules/tvsubtitles/backend.py b/modules/tvsubtitles/backend.py
index de485871ae05c4acd9a1859878d26f02ce3e3ec9..187cc12d5af0c2f8056de8c8813b0a43692e9ac2 100644
--- a/modules/tvsubtitles/backend.py
+++ b/modules/tvsubtitles/backend.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.subtitle import ICapSubtitle, LanguageNotSupported
+from weboob.capabilities.subtitle import CapSubtitle, LanguageNotSupported
from weboob.tools.backend import BaseBackend
from .browser import TvsubtitlesBrowser, LANGUAGE_LIST
@@ -27,7 +27,7 @@
__all__ = ['TvsubtitlesBackend']
-class TvsubtitlesBackend(BaseBackend, ICapSubtitle):
+class TvsubtitlesBackend(BaseBackend, CapSubtitle):
NAME = 'tvsubtitles'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/twitter/backend.py b/modules/twitter/backend.py
index 1344e5743f84eed2bcfd37b334064653570ea5b4..b2952a605b190755f34f4b1586ccd3062d80bcaa 100644
--- a/modules/twitter/backend.py
+++ b/modules/twitter/backend.py
@@ -21,8 +21,8 @@
from weboob.tools.value import Value, ValueBackendPassword
from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.messages import ICapMessages, Thread, ICapMessagesPost
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound, Collection
+from weboob.capabilities.messages import CapMessages, Thread, CapMessagesPost
+from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection
from weboob.capabilities.base import find_object
from weboob.tools.exceptions import BrowserForbidden
from .browser import TwitterBrowser
@@ -31,7 +31,7 @@
__all__ = ['TwitterBackend']
-class TwitterBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapCollection):
+class TwitterBackend(BaseBackend, CapMessages, CapMessagesPost, CapCollection):
NAME = 'twitter'
DESCRIPTION = u'twitter website'
MAINTAINER = u'Bezleputh'
diff --git a/modules/ups/backend.py b/modules/ups/backend.py
index f3704b69631259a18868d18b1f1155986fc830c1..803eccc63cd8ff396522664884605e6a5ba50f9d 100644
--- a/modules/ups/backend.py
+++ b/modules/ups/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.parcel import ICapParcel
+from weboob.capabilities.parcel import CapParcel
from weboob.tools.backend import BaseBackend
from .browser import UpsBrowser
@@ -27,7 +27,7 @@
__all__ = ['UpsBackend']
-class UpsBackend(BaseBackend, ICapParcel):
+class UpsBackend(BaseBackend, CapParcel):
NAME = 'ups'
DESCRIPTION = u'UPS website'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/vimeo/backend.py b/modules/vimeo/backend.py
index 69d477016a8a38a59b408bc3ece54f0739785af0..191b8bb1f49138f6e60af4c01b2f042b810e79da 100644
--- a/modules/vimeo/backend.py
+++ b/modules/vimeo/backend.py
@@ -21,9 +21,9 @@
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from .browser import VimeoBrowser
from .video import VimeoVideo
@@ -32,7 +32,7 @@
__all__ = ['VimeoBackend']
-class VimeoBackend(BaseBackend, ICapVideo, ICapCollection):
+class VimeoBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'vimeo'
MAINTAINER = u'François Revol'
EMAIL = 'revol@free.fr'
@@ -47,7 +47,7 @@ def get_video(self, _id):
SORTBY = ['relevance', 'rating', 'views', 'time']
- # def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ # def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
# with self.browser:
# return self.browser.search_videos(pattern, self.SORTBY[sortby])
diff --git a/modules/vlille/backend.py b/modules/vlille/backend.py
index c1a42a1b20e9fca2673822fefea45db6b2645c58..f50ea92af33c13c1cd0debe230cec2e23d9e001c 100644
--- a/modules/vlille/backend.py
+++ b/modules/vlille/backend.py
@@ -20,14 +20,14 @@
from weboob.tools.backend import BaseBackend
from weboob.capabilities.base import find_object
-from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge, SensorNotFound
+from weboob.capabilities.gauge import CapGauge, GaugeSensor, Gauge, SensorNotFound
from .browser import VlilleBrowser
__all__ = ['VlilleBackend']
-class VlilleBackend(BaseBackend, ICapGauge):
+class VlilleBackend(BaseBackend, CapGauge):
NAME = 'vlille'
DESCRIPTION = u'access to vlille datas'
MAINTAINER = u'Bezleputh'
diff --git a/modules/voyagessncf/backend.py b/modules/voyagessncf/backend.py
index bb6a0b53a5f72730568323f8db7f63c67edf1369..63ed380ccf6c5c172952d03f8db5549de2a8a018 100644
--- a/modules/voyagessncf/backend.py
+++ b/modules/voyagessncf/backend.py
@@ -21,7 +21,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.value import Value
-from weboob.capabilities.travel import ICapTravel, Station, Departure
+from weboob.capabilities.travel import CapTravel, Station, Departure
from weboob.capabilities import UserError
from .browser import VoyagesSNCFBrowser
@@ -30,7 +30,7 @@
__all__ = ['VoyagesSNCFBackend']
-class VoyagesSNCFBackend(BaseBackend, ICapTravel):
+class VoyagesSNCFBackend(BaseBackend, CapTravel):
NAME = 'voyagessncf'
DESCRIPTION = u'Voyages SNCF'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/weather/backend.py b/modules/weather/backend.py
index 0adf013c0d372a0cc0dd062be1f3b1417c55dbf0..2f06753216514b4ba73434db5c966fe741053fb0 100644
--- a/modules/weather/backend.py
+++ b/modules/weather/backend.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.weather import ICapWeather
+from weboob.capabilities.weather import CapWeather
from weboob.tools.backend import BaseBackend
from .browser import WeatherBrowser
@@ -26,7 +26,7 @@
__all__ = ['WeatherBackend']
-class WeatherBackend(BaseBackend, ICapWeather):
+class WeatherBackend(BaseBackend, CapWeather):
NAME = 'weather'
MAINTAINER = u'Arno Renevier'
EMAIL = 'arno@renevier.net'
diff --git a/modules/wordreference/backend.py b/modules/wordreference/backend.py
index 0f1743c53e7f1e00cf46e99e4854ab8aa0756571..3b2b69cefda18b7bbee385455fe8135995b67c76 100644
--- a/modules/wordreference/backend.py
+++ b/modules/wordreference/backend.py
@@ -19,7 +19,7 @@
"backend for http://www.wordreference.com"
-from weboob.capabilities.translate import ICapTranslate, Translation, TranslationFail, LanguageNotSupported
+from weboob.capabilities.translate import CapTranslate, Translation, TranslationFail, LanguageNotSupported
from weboob.tools.backend import BaseBackend
from .browser import WordReferenceBrowser
@@ -28,7 +28,7 @@
__all__ = ['WordReferenceBackend']
-class WordReferenceBackend(BaseBackend, ICapTranslate):
+class WordReferenceBackend(BaseBackend, CapTranslate):
MAINTAINER = u'Lucien Loiseau'
EMAIL = 'loiseau.lucien@gmail.com'
VERSION = '0.j'
diff --git a/modules/yahoo/backend.py b/modules/yahoo/backend.py
index 2cb4261339b80223066cb57859b7d692edcaadcd..f0c0dc0a3bbcb8f50f90fa396adb7ccf4ba4f256 100644
--- a/modules/yahoo/backend.py
+++ b/modules/yahoo/backend.py
@@ -22,7 +22,7 @@
from dateutil.parser import parse as parse_dt
-from weboob.capabilities.weather import ICapWeather, CityNotFound, Current, Forecast, City
+from weboob.capabilities.weather import CapWeather, CityNotFound, Current, Forecast, City
from weboob.tools.backend import BaseBackend
from weboob.tools.browser import StandardBrowser
@@ -30,7 +30,7 @@
__all__ = ['YahooBackend']
-class YahooBackend(BaseBackend, ICapWeather):
+class YahooBackend(BaseBackend, CapWeather):
NAME = 'yahoo'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/youjizz/backend.py b/modules/youjizz/backend.py
index 849ea086fd8f9f482f086c162afe4017eaa10ac6..2a653edcdad39dd60b8212703a26856fb5e2abc1 100644
--- a/modules/youjizz/backend.py
+++ b/modules/youjizz/backend.py
@@ -20,8 +20,8 @@
-from weboob.capabilities.video import ICapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.video import CapVideo, BaseVideo
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from weboob.tools.backend import BaseBackend
from .browser import YoujizzBrowser
@@ -30,7 +30,7 @@
__all__ = ['YoujizzBackend']
-class YoujizzBackend(BaseBackend, ICapVideo, ICapCollection):
+class YoujizzBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'youjizz'
MAINTAINER = u'Roger Philibert'
EMAIL = 'roger.philibert@gmail.com'
@@ -43,7 +43,7 @@ def get_video(self, _id):
video = self.browser.get_video(_id)
return video
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
if not nsfw:
return set()
return self.browser.search_videos(pattern)
diff --git a/modules/youporn/backend.py b/modules/youporn/backend.py
index 83c03d78f8adf8e7f1109717c6a0c12f973d09a6..1a572608e132ab0b0d69fb59e7c9199ce5f54da5 100644
--- a/modules/youporn/backend.py
+++ b/modules/youporn/backend.py
@@ -20,9 +20,9 @@
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
from weboob.tools.backend import BaseBackend
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from .browser import YoupornBrowser
from .video import YoupornVideo
@@ -31,7 +31,7 @@
__all__ = ['YoupornBackend']
-class YoupornBackend(BaseBackend, ICapVideo, ICapCollection):
+class YoupornBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'youporn'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
@@ -46,7 +46,7 @@ def get_video(self, _id):
SORTBY = ['relevance', 'rating', 'views', 'time']
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
if not nsfw:
return set()
with self.browser:
diff --git a/modules/youtube/backend.py b/modules/youtube/backend.py
index e1afd56346f77fdb39d0d6b564b83db400ab9d13..1cd1c537d5e0917a8838da51fd3dfe40ed9dbaf6 100644
--- a/modules/youtube/backend.py
+++ b/modules/youtube/backend.py
@@ -31,8 +31,8 @@
from weboob.capabilities.base import NotAvailable
from weboob.capabilities.image import BaseImage
-from weboob.capabilities.video import ICapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.video import CapVideo, BaseVideo
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.misc import to_unicode
from weboob.tools.value import ValueBackendPassword, Value
@@ -44,7 +44,7 @@
__all__ = ['YoutubeBackend']
-class YoutubeBackend(BaseBackend, ICapVideo, ICapCollection):
+class YoutubeBackend(BaseBackend, CapVideo, CapCollection):
NAME = 'youtube'
MAINTAINER = u'Laurent Bachelier'
EMAIL = 'laurent@bachelier.name'
@@ -122,7 +122,7 @@ def get_video(self, _id):
return video
- def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapVideo.SEARCH_RELEVANCE, nsfw=False):
YOUTUBE_MAX_RESULTS = 50
YOUTUBE_MAX_START_INDEX = 500
yt_service = gdata.youtube.service.YouTubeService()
@@ -154,7 +154,7 @@ def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
return
def latest_videos(self):
- return self.search_videos(None, ICapVideo.SEARCH_DATE)
+ return self.search_videos(None, CapVideo.SEARCH_DATE)
def fill_video(self, video, fields):
if 'thumbnail' in fields:
diff --git a/weboob/applications/boobank/boobank.py b/weboob/applications/boobank/boobank.py
index bee1d941656f22148c99453e4d0c457382903548..b7754fb9d67ac24d7faba182d872bf62a23830dc 100644
--- a/weboob/applications/boobank/boobank.py
+++ b/weboob/applications/boobank/boobank.py
@@ -26,7 +26,7 @@
import sys
from weboob.capabilities.base import empty
-from weboob.capabilities.bank import ICapBank, Account, Transaction
+from weboob.capabilities.bank import CapBank, Account, Transaction
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
@@ -280,7 +280,7 @@ class Boobank(ReplApplication):
APPNAME = 'boobank'
VERSION = '0.j'
COPYRIGHT = 'Copyright(C) 2010-2011 Romain Bignon, Christophe Benz'
- CAPS = ICapBank
+ CAPS = CapBank
DESCRIPTION = "Console application allowing to list your bank accounts and get their balance, " \
"display accounts history and coming bank operations, and transfer money from an account to " \
"another (if available)."
diff --git a/weboob/applications/boobathon/boobathon.py b/weboob/applications/boobathon/boobathon.py
index e41ba35eb7226210b739868ca55b198a4b22ddd0..4b3d1c71c918cbaa90f22b3dc0c155591f526df4 100644
--- a/weboob/applications/boobathon/boobathon.py
+++ b/weboob/applications/boobathon/boobathon.py
@@ -24,7 +24,7 @@
from urlparse import urlsplit
from random import choice
-from weboob.capabilities.content import ICapContent
+from weboob.capabilities.content import CapContent
from weboob.tools.application.repl import ReplApplication
from weboob.tools.ordereddict import OrderedDict
@@ -281,7 +281,7 @@ class Boobathon(ReplApplication):
COPYRIGHT = 'Copyright(C) 2011 Romain Bignon'
DESCRIPTION = 'Console application to participate to a Boobathon.'
SHORT_DESCRIPTION = "participate in a Boobathon"
- CAPS = ICapContent
+ CAPS = CapContent
SYNOPSIS = 'Usage: %prog [-dqv] [-b backends] [-cnfs] boobathon\n'
SYNOPSIS += ' %prog [--help] [--version]'
diff --git a/weboob/applications/boobcoming/boobcoming.py b/weboob/applications/boobcoming/boobcoming.py
index 6a54acb43ec286599a9e6272a374b2cda2f35081..cbfb3e1e61686039f9abf47bc169a249654705c5 100644
--- a/weboob/applications/boobcoming/boobcoming.py
+++ b/weboob/applications/boobcoming/boobcoming.py
@@ -23,7 +23,7 @@
from weboob.tools.date import parse_date
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
from weboob.capabilities.base import empty
-from weboob.capabilities.calendar import ICapCalendarEvent, Query, CATEGORIES, BaseCalendarEvent
+from weboob.capabilities.calendar import CapCalendarEvent, Query, CATEGORIES, BaseCalendarEvent
from weboob.tools.application.repl import ReplApplication, defaultcount
@@ -143,7 +143,7 @@ class Boobcoming(ReplApplication):
COPYRIGHT = 'Copyright(C) 2012 Bezleputh'
DESCRIPTION = "Console application to see upcoming events."
SHORT_DESCRIPTION = "see upcoming events"
- CAPS = ICapCalendarEvent
+ CAPS = CapCalendarEvent
EXTRA_FORMATTERS = {'upcoming_list': UpcomingListFormatter,
'upcoming': UpcomingFormatter,
'simple_upcoming': UpcomingSimpleFormatter,
diff --git a/weboob/applications/boobill/boobill.py b/weboob/applications/boobill/boobill.py
index 28fc6b5eb4cdcb6e393aa04288124dbea5b77794..5cea5b95fa0cead5e3c29f23ca4b0b5bfbc319a6 100644
--- a/weboob/applications/boobill/boobill.py
+++ b/weboob/applications/boobill/boobill.py
@@ -21,7 +21,7 @@
import sys
from decimal import Decimal
-from weboob.capabilities.bill import ICapBill, Detail, Subscription
+from weboob.capabilities.bill import CapBill, Detail, Subscription
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import PrettyFormatter
from weboob.tools.application.base import MoreResultsAvailable
@@ -45,7 +45,7 @@ class Boobill(ReplApplication):
COPYRIGHT = 'Copyright(C) 2012 Florent Fourcot'
DESCRIPTION = 'Console application allowing to get and download bills.'
SHORT_DESCRIPTION = "get and download bills"
- CAPS = ICapBill
+ CAPS = CapBill
COLLECTION_OBJECTS = (Subscription, )
EXTRA_FORMATTERS = {'subscriptions': SubscriptionsFormatter,
}
diff --git a/weboob/applications/booblyrics/booblyrics.py b/weboob/applications/booblyrics/booblyrics.py
index 5ef024faeea9bb75b6d0c7c0879c3baca23b9325..6c5f410da4d71494c7a5a94fa3b89fb34c261c78 100644
--- a/weboob/applications/booblyrics/booblyrics.py
+++ b/weboob/applications/booblyrics/booblyrics.py
@@ -21,7 +21,7 @@
import sys
-from weboob.capabilities.lyrics import ICapLyrics
+from weboob.capabilities.lyrics import CapLyrics
from weboob.capabilities.base import empty
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
@@ -62,7 +62,7 @@ class Booblyrics(ReplApplication):
COPYRIGHT = 'Copyright(C) 2013 Julien Veyssier'
DESCRIPTION = "Console application allowing to search for song lyrics on various websites."
SHORT_DESCRIPTION = "search and display song lyrics"
- CAPS = ICapLyrics
+ CAPS = CapLyrics
EXTRA_FORMATTERS = {'lyrics_list': LyricsListFormatter,
'lyrics_get': LyricsGetFormatter,
}
diff --git a/weboob/applications/boobmsg/boobmsg.py b/weboob/applications/boobmsg/boobmsg.py
index 6017d34789b796ab12f1bf34b77bf835aa24af10..5bcb5382e5a39548607c2475d1da378662fae98e 100644
--- a/weboob/applications/boobmsg/boobmsg.py
+++ b/weboob/applications/boobmsg/boobmsg.py
@@ -27,9 +27,9 @@
from lxml import etree
from weboob.core import CallErrors
-from weboob.capabilities.messages import ICapMessages, Message, Thread
-from weboob.capabilities.account import ICapAccount
-from weboob.capabilities.contact import ICapContact
+from weboob.capabilities.messages import CapMessages, Message, Thread
+from weboob.capabilities.account import CapAccount
+from weboob.capabilities.contact import CapContact
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter
from weboob.tools.misc import html2text
@@ -239,7 +239,7 @@ class Boobmsg(ReplApplication):
DESCRIPTION = "Console application allowing to send messages on various websites and " \
"to display message threads and contents."
SHORT_DESCRIPTION = "send and receive message threads"
- CAPS = ICapMessages
+ CAPS = CapMessages
EXTRA_FORMATTERS = {'msglist': MessagesListFormatter,
'msg': MessageFormatter,
'xhtml': XHtmlFormatter,
@@ -262,7 +262,7 @@ def add_application_options(self, group):
type='string', dest='title')
def load_default_backends(self):
- self.load_backends(ICapMessages, storage=self.create_storage())
+ self.load_backends(CapMessages, storage=self.create_storage())
def main(self, argv):
self.load_config()
@@ -282,7 +282,7 @@ def do_status(self, line):
results = {}
for backend, field in self.do('get_account_status',
backends=backend_name,
- caps=ICapAccount):
+ caps=CapAccount):
if backend.name in results:
results[backend.name].append(field)
else:
@@ -460,7 +460,7 @@ def do_profile(self, id):
_id, backend_name = self.parse_id(id, unique_backend=True)
found = 0
- for backend, contact in self.do('get_contact', _id, backends=backend_name, caps=ICapContact):
+ for backend, contact in self.do('get_contact', _id, backends=backend_name, caps=CapContact):
if contact:
self.format(contact)
found = 1
diff --git a/weboob/applications/boobooks/boobooks.py b/weboob/applications/boobooks/boobooks.py
index c09d1df1f3b5e52e0520eca40cd2121065afbf6a..300dc10108b0a0532c53ab78887af08fb4255db3 100644
--- a/weboob/applications/boobooks/boobooks.py
+++ b/weboob/applications/boobooks/boobooks.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.library import ICapBook, Book
+from weboob.capabilities.library import CapBook, Book
from weboob.tools.application.repl import ReplApplication
from weboob.tools.application.formatters.iformatter import PrettyFormatter
import sys
@@ -41,7 +41,7 @@ class Boobooks(ReplApplication):
APPNAME = 'boobooks'
VERSION = '0.j'
COPYRIGHT = 'Copyright(C) 2012 Jeremy Monnet'
- CAPS = ICapBook
+ CAPS = CapBook
DESCRIPTION = "Console application allowing to list your books rented or booked at the library, " \
"book and search new ones, get your booking history (if available)."
SHORT_DESCRIPTION = "manage rented books"
diff --git a/weboob/applications/boobsize/boobsize.py b/weboob/applications/boobsize/boobsize.py
index f8fd4af3b0a48d6e1036c82730cee0b7b320460a..7a028b5f4c44c933c39ba852e3bd175589df074c 100644
--- a/weboob/applications/boobsize/boobsize.py
+++ b/weboob/applications/boobsize/boobsize.py
@@ -19,7 +19,7 @@
from weboob.capabilities.base import empty
-from weboob.capabilities.gauge import ICapGauge, SensorNotFound
+from weboob.capabilities.gauge import CapGauge, SensorNotFound
from weboob.tools.application.repl import ReplApplication
from weboob.tools.application.formatters.iformatter import IFormatter
@@ -98,7 +98,7 @@ class Boobsize(ReplApplication):
COPYRIGHT = 'Copyright(C) 2013 Florent Fourcot'
DESCRIPTION = "Console application allowing to display various sensors and gauges values."
SHORT_DESCRIPTION = "display sensors and gauges values"
- CAPS = (ICapGauge)
+ CAPS = (CapGauge)
DEFAULT_FORMATTER = 'table'
EXTRA_FORMATTERS = {'gauge_list': GaugeFormatter, }
COMMANDS_FORMATTERS = {'search': 'gauge_list',
@@ -123,7 +123,7 @@ def do_search(self, pattern):
"""
self.change_path([u'gauges'])
self.start_format()
- for backend, gauge in self.do('iter_gauges', pattern or None, caps=ICapGauge):
+ for backend, gauge in self.do('iter_gauges', pattern or None, caps=CapGauge):
self.cached_format(gauge)
def complete_search(self, text, line, *ignored):
@@ -141,7 +141,7 @@ def do_details(self, line):
_id, backend_name = self.parse_id(gauge)
self.start_format()
- for backend, sensor in self.do('iter_sensors', _id, pattern=pattern, backends=backend_name, caps=ICapGauge):
+ for backend, sensor in self.do('iter_sensors', _id, pattern=pattern, backends=backend_name, caps=CapGauge):
self.format(sensor)
def do_history(self, line):
@@ -154,7 +154,7 @@ def do_history(self, line):
_id, backend_name = self.parse_id(gauge)
self.start_format()
- for backend, measure in self.do('iter_gauge_history', _id, backends=backend_name, caps=ICapGauge):
+ for backend, measure in self.do('iter_gauge_history', _id, backends=backend_name, caps=CapGauge):
self.format(measure)
def complete_last_sensor_measure(self, text, line, *ignored):
@@ -172,5 +172,5 @@ def do_last_sensor_measure(self, line):
_id, backend_name = self.parse_id(gauge)
self.start_format()
- for backend, measure in self.do('get_last_measure', _id, backends=backend_name, caps=ICapGauge):
+ for backend, measure in self.do('get_last_measure', _id, backends=backend_name, caps=CapGauge):
self.format(measure)
diff --git a/weboob/applications/boobtracker/boobtracker.py b/weboob/applications/boobtracker/boobtracker.py
index 94526b8986b6d065503c7d403d49e4eefa53838d..1fa92d0f1f5aecfb532789943711f81e381594d8 100644
--- a/weboob/applications/boobtracker/boobtracker.py
+++ b/weboob/applications/boobtracker/boobtracker.py
@@ -29,7 +29,7 @@
import unicodedata
from weboob.capabilities.base import empty, BaseObject
-from weboob.capabilities.bugtracker import ICapBugTracker, Query, Update, Project, Issue, IssueError
+from weboob.capabilities.bugtracker import CapBugTracker, Query, Update, Project, Issue, IssueError
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
from weboob.tools.misc import html2text
@@ -109,7 +109,7 @@ class BoobTracker(ReplApplication):
COPYRIGHT = 'Copyright(C) 2011 Romain Bignon'
DESCRIPTION = "Console application allowing to create, edit, view bug tracking issues."
SHORT_DESCRIPTION = "manage bug tracking issues"
- CAPS = ICapBugTracker
+ CAPS = CapBugTracker
EXTRA_FORMATTERS = {'issue_info': IssueFormatter,
'issues_list': IssuesListFormatter,
}
diff --git a/weboob/applications/cineoob/cineoob.py b/weboob/applications/cineoob/cineoob.py
index c0654e1bb23b6efdcd4532c01247afa24a086e90..434567ce2baf9cf36505e6e294559f57c4be95cd 100644
--- a/weboob/applications/cineoob/cineoob.py
+++ b/weboob/applications/cineoob/cineoob.py
@@ -24,9 +24,9 @@
from weboob.applications.weboorrents.weboorrents import TorrentInfoFormatter, TorrentListFormatter
from weboob.applications.suboob.suboob import SubtitleInfoFormatter, SubtitleListFormatter
-from weboob.capabilities.torrent import ICapTorrent, MagnetOnly
-from weboob.capabilities.cinema import ICapCinema
-from weboob.capabilities.subtitle import ICapSubtitle
+from weboob.capabilities.torrent import CapTorrent, MagnetOnly
+from weboob.capabilities.cinema import CapCinema
+from weboob.capabilities.subtitle import CapSubtitle
from weboob.capabilities.base import empty
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
@@ -183,7 +183,7 @@ class Cineoob(ReplApplication):
", list persons related to a movie, list movies related to a person and list common movies " \
"of two persons."
SHORT_DESCRIPTION = "search movies and persons around cinema"
- CAPS = (ICapCinema, ICapTorrent, ICapSubtitle)
+ CAPS = (CapCinema, CapTorrent, CapSubtitle)
EXTRA_FORMATTERS = {'movie_list': MovieListFormatter,
'movie_info': MovieInfoFormatter,
'movie_releases': MovieReleasesFormatter,
@@ -229,11 +229,11 @@ def do_movies_in_common(self, line):
"""
id1, id2 = self.parse_command_args(line, 2, 1)
- person1 = self.get_object(id1, 'get_person', caps=ICapCinema)
+ person1 = self.get_object(id1, 'get_person', caps=CapCinema)
if not person1:
print >>sys.stderr, 'Person not found: %s' % id1
return 3
- person2 = self.get_object(id2, 'get_person', caps=ICapCinema)
+ person2 = self.get_object(id2, 'get_person', caps=CapCinema)
if not person2:
print >>sys.stderr, 'Person not found: %s' % id2
return 3
@@ -242,15 +242,15 @@ def do_movies_in_common(self, line):
self.options.count = None
lid1 = []
- for backend, id in self.do('iter_person_movies_ids', person1.id, caps=ICapCinema):
+ for backend, id in self.do('iter_person_movies_ids', person1.id, caps=CapCinema):
lid1.append(id)
lid2 = []
- for backend, id in self.do('iter_person_movies_ids', person2.id, caps=ICapCinema):
+ for backend, id in self.do('iter_person_movies_ids', person2.id, caps=CapCinema):
lid2.append(id)
self.options.count = initial_count
inter = list(set(lid1) & set(lid2))
for common in inter:
- movie = self.get_object(common, 'get_movie', caps=ICapCinema)
+ movie = self.get_object(common, 'get_movie', caps=CapCinema)
if movie:
self.cached_format(movie)
@@ -262,11 +262,11 @@ def do_persons_in_common(self, line):
"""
id1, id2 = self.parse_command_args(line, 2, 1)
- movie1 = self.get_object(id1, 'get_movie', caps=ICapCinema)
+ movie1 = self.get_object(id1, 'get_movie', caps=CapCinema)
if not movie1:
print >>sys.stderr, 'Movie not found: %s' % id1
return 3
- movie2 = self.get_object(id2, 'get_movie', caps=ICapCinema)
+ movie2 = self.get_object(id2, 'get_movie', caps=CapCinema)
if not movie2:
print >>sys.stderr, 'Movie not found: %s' % id2
return 3
@@ -275,15 +275,15 @@ def do_persons_in_common(self, line):
self.options.count = None
lid1 = []
- for backend, id in self.do('iter_movie_persons_ids', movie1.id, caps=ICapCinema):
+ for backend, id in self.do('iter_movie_persons_ids', movie1.id, caps=CapCinema):
lid1.append(id)
lid2 = []
- for backend, id in self.do('iter_movie_persons_ids', movie2.id, caps=ICapCinema):
+ for backend, id in self.do('iter_movie_persons_ids', movie2.id, caps=CapCinema):
lid2.append(id)
self.options.count = initial_count
inter = list(set(lid1) & set(lid2))
for common in inter:
- person = self.get_object(common, 'get_person', caps=ICapCinema)
+ person = self.get_object(common, 'get_person', caps=CapCinema)
self.cached_format(person)
def do_info_movie(self, id):
@@ -292,7 +292,7 @@ def do_info_movie(self, id):
Get information about a movie.
"""
- movie = self.get_object(id, 'get_movie', caps=ICapCinema)
+ movie = self.get_object(id, 'get_movie', caps=CapCinema)
if not movie:
print >>sys.stderr, 'Movie not found: %s' % id
@@ -307,7 +307,7 @@ def do_info_person(self, id):
Get information about a person.
"""
- person = self.get_object(id, 'get_person', caps=ICapCinema)
+ person = self.get_object(id, 'get_person', caps=CapCinema)
if not person:
print >>sys.stderr, 'Person not found: %s' % id
@@ -328,7 +328,7 @@ def do_search_movie(self, pattern):
pattern = None
self.start_format(pattern=pattern)
- for backend, movie in self.do('iter_movies', pattern=pattern, caps=ICapCinema):
+ for backend, movie in self.do('iter_movies', pattern=pattern, caps=CapCinema):
self.cached_format(movie)
@defaultcount(10)
@@ -343,7 +343,7 @@ def do_search_person(self, pattern):
pattern = None
self.start_format(pattern=pattern)
- for backend, person in self.do('iter_persons', pattern=pattern, caps=ICapCinema):
+ for backend, person in self.do('iter_persons', pattern=pattern, caps=CapCinema):
self.cached_format(person)
def do_casting(self, line):
@@ -355,12 +355,12 @@ def do_casting(self, line):
"""
movie_id, role = self.parse_command_args(line, 2, 1)
- movie = self.get_object(movie_id, 'get_movie', caps=ICapCinema)
+ movie = self.get_object(movie_id, 'get_movie', caps=CapCinema)
if not movie:
print >>sys.stderr, 'Movie not found: %s' % id
return 3
- for backend, person in self.do('iter_movie_persons', movie.id, role, backends=movie.backend, caps=ICapCinema):
+ for backend, person in self.do('iter_movie_persons', movie.id, role, backends=movie.backend, caps=CapCinema):
self.cached_format(person)
def do_filmography(self, line):
@@ -372,12 +372,12 @@ def do_filmography(self, line):
"""
person_id, role = self.parse_command_args(line, 2, 1)
- person = self.get_object(person_id, 'get_person', caps=ICapCinema)
+ person = self.get_object(person_id, 'get_person', caps=CapCinema)
if not person:
print >>sys.stderr, 'Person not found: %s' % id
return 3
- for backend, movie in self.do('iter_person_movies', person.id, role, backends=person.backend, caps=ICapCinema):
+ for backend, movie in self.do('iter_person_movies', person.id, role, backends=person.backend, caps=CapCinema):
self.cached_format(movie)
def do_biography(self, person_id):
@@ -386,7 +386,7 @@ def do_biography(self, person_id):
Show the complete biography of a person.
"""
- person = self.get_object(person_id, 'get_person', ('name', 'biography'), caps=ICapCinema)
+ person = self.get_object(person_id, 'get_person', ('name', 'biography'), caps=CapCinema)
if not person:
print >>sys.stderr, 'Person not found: %s' % person_id
return 3
@@ -410,13 +410,13 @@ def do_releases(self, line):
"""
id, country = self.parse_command_args(line, 2, 1)
- movie = self.get_object(id, 'get_movie', ('original_title'), caps=ICapCinema)
+ movie = self.get_object(id, 'get_movie', ('original_title'), caps=CapCinema)
if not movie:
print >>sys.stderr, 'Movie not found: %s' % id
return 3
# i would like to clarify with fillobj but how could i fill the movie AND choose the country ?
- for backend, release in self.do('get_movie_releases', movie.id, country, caps=ICapCinema, backends=movie.backend):
+ for backend, release in self.do('get_movie_releases', movie.id, country, caps=CapCinema, backends=movie.backend):
if not empty(release):
movie.all_release_dates = u'%s' % (release)
else:
@@ -439,7 +439,7 @@ def do_info_torrent(self, id):
Get information about a torrent.
"""
- torrent = self.get_object(id, 'get_torrent', caps=ICapTorrent)
+ torrent = self.get_object(id, 'get_torrent', caps=CapTorrent)
if not torrent:
print >>sys.stderr, 'Torrent not found: %s' % id
return 3
@@ -470,7 +470,7 @@ def do_getfile_torrent(self, line):
dest = '%s.torrent' % _id
try:
- for backend, buf in self.do('get_torrent_file', _id, backends=backend_name, caps=ICapTorrent):
+ for backend, buf in self.do('get_torrent_file', _id, backends=backend_name, caps=CapTorrent):
if buf:
if dest == '-':
print buf
@@ -507,7 +507,7 @@ def do_search_torrent(self, pattern):
pattern = None
self.start_format(pattern=pattern)
- for backend, torrent in self.do('iter_torrents', pattern=pattern, caps=ICapTorrent):
+ for backend, torrent in self.do('iter_torrents', pattern=pattern, caps=CapTorrent):
self.cached_format(torrent)
@defaultcount(10)
@@ -517,7 +517,7 @@ def do_search_movie_torrent(self, id):
Search torrents of movie_ID.
"""
- movie = self.get_object(id, 'get_movie', ('original_title'), caps=ICapCinema)
+ movie = self.get_object(id, 'get_movie', ('original_title'), caps=CapCinema)
if not movie:
print >>sys.stderr, 'Movie not found: %s' % id
return 3
@@ -529,7 +529,7 @@ def do_search_movie_torrent(self, id):
pattern = None
self.start_format(pattern=pattern)
- for backend, torrent in self.do('iter_torrents', pattern=pattern, caps=ICapTorrent):
+ for backend, torrent in self.do('iter_torrents', pattern=pattern, caps=CapTorrent):
self.cached_format(torrent)
#================== SUBTITLE ==================
@@ -546,7 +546,7 @@ def do_info_subtitle(self, id):
Get information about a subtitle.
"""
- subtitle = self.get_object(id, 'get_subtitle', caps=ICapCinema)
+ subtitle = self.get_object(id, 'get_subtitle', caps=CapCinema)
if not subtitle:
print >>sys.stderr, 'Subtitle not found: %s' % id
return 3
@@ -576,7 +576,7 @@ def do_getfile_subtitle(self, line):
if dest is None:
dest = '%s' % _id
- for backend, buf in self.do('get_subtitle_file', _id, backends=backend_name, caps=ICapSubtitle):
+ for backend, buf in self.do('get_subtitle_file', _id, backends=backend_name, caps=CapSubtitle):
if buf:
if dest == '-':
print buf
@@ -625,7 +625,7 @@ def do_search_subtitle(self, line):
pattern = None
self.start_format(pattern=pattern)
- for backend, subtitle in self.do('iter_subtitles', language=language, pattern=pattern, caps=ICapSubtitle):
+ for backend, subtitle in self.do('iter_subtitles', language=language, pattern=pattern, caps=CapSubtitle):
self.cached_format(subtitle)
@defaultcount(10)
@@ -656,7 +656,7 @@ def do_search_movie_subtitle(self, line):
----------------------
"""
language, id = self.parse_command_args(line, 2, 2)
- movie = self.get_object(id, 'get_movie', ('original_title'), caps=ICapCinema)
+ movie = self.get_object(id, 'get_movie', ('original_title'), caps=CapCinema)
if not movie:
print >>sys.stderr, 'Movie not found: %s' % id
return 3
@@ -667,5 +667,5 @@ def do_search_movie_subtitle(self, line):
pattern = None
self.start_format(pattern=pattern)
- for backend, subtitle in self.do('iter_subtitles', language=language, pattern=pattern, caps=ICapSubtitle):
+ for backend, subtitle in self.do('iter_subtitles', language=language, pattern=pattern, caps=CapSubtitle):
self.cached_format(subtitle)
diff --git a/weboob/applications/comparoob/comparoob.py b/weboob/applications/comparoob/comparoob.py
index 50fed8ae0073702ae4280009e270ce0db1c6beba..3393cbeae2ef2470176a38395e7ae5cbf3324e98 100644
--- a/weboob/applications/comparoob/comparoob.py
+++ b/weboob/applications/comparoob/comparoob.py
@@ -22,7 +22,7 @@
import sys
-from weboob.capabilities.pricecomparison import ICapPriceComparison
+from weboob.capabilities.pricecomparison import CapPriceComparison
from weboob.tools.misc import html2text
from weboob.tools.application.repl import ReplApplication
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
@@ -88,7 +88,7 @@ class Comparoob(ReplApplication):
COMMANDS_FORMATTERS = {'prices': 'prices',
'info': 'price',
}
- CAPS = ICapPriceComparison
+ CAPS = CapPriceComparison
def do_prices(self, pattern):
"""
diff --git a/weboob/applications/cookboob/cookboob.py b/weboob/applications/cookboob/cookboob.py
index 9c51d7efce97e115619ee2db2b2275c958d2e042..a1da748f58113a1cf4af103b7a7703f9b73d8c16 100644
--- a/weboob/applications/cookboob/cookboob.py
+++ b/weboob/applications/cookboob/cookboob.py
@@ -22,7 +22,7 @@
import sys
import codecs
-from weboob.capabilities.recipe import ICapRecipe
+from weboob.capabilities.recipe import CapRecipe
from weboob.capabilities.base import empty
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
@@ -79,7 +79,7 @@ class Cookboob(ReplApplication):
COPYRIGHT = 'Copyright(C) 2013 Julien Veyssier'
DESCRIPTION = "Console application allowing to search for recipes on various websites."
SHORT_DESCRIPTION = "search and consult recipes"
- CAPS = ICapRecipe
+ CAPS = CapRecipe
EXTRA_FORMATTERS = {'recipe_list': RecipeListFormatter,
'recipe_info': RecipeInfoFormatter
}
diff --git a/weboob/applications/flatboob/flatboob.py b/weboob/applications/flatboob/flatboob.py
index 3d888ddf5293642359238fbd60fd743c49afec66..5b02d8c7de650a2bae91cf743adeca0b2e5d7381 100644
--- a/weboob/applications/flatboob/flatboob.py
+++ b/weboob/applications/flatboob/flatboob.py
@@ -20,7 +20,7 @@
import sys
-from weboob.capabilities.housing import ICapHousing, Query
+from weboob.capabilities.housing import CapHousing, Query
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
@@ -79,7 +79,7 @@ class Flatboob(ReplApplication):
COPYRIGHT = 'Copyright(C) 2012 Romain Bignon'
DESCRIPTION = "Console application to search for housing."
SHORT_DESCRIPTION = "search for housing"
- CAPS = ICapHousing
+ CAPS = CapHousing
EXTRA_FORMATTERS = {'housing_list': HousingListFormatter,
'housing': HousingFormatter,
}
diff --git a/weboob/applications/galleroob/galleroob.py b/weboob/applications/galleroob/galleroob.py
index 95d3132a2caf94ee2ba46302ecf3a93834d04a4c..8f99fd7eef2689bb61215a95605b7012cd3a2747 100644
--- a/weboob/applications/galleroob/galleroob.py
+++ b/weboob/applications/galleroob/galleroob.py
@@ -25,7 +25,7 @@
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.capabilities.base import empty
-from weboob.capabilities.gallery import ICapGallery, BaseGallery, BaseImage
+from weboob.capabilities.gallery import CapGallery, BaseGallery, BaseImage
from weboob.tools.application.formatters.iformatter import PrettyFormatter
@@ -52,7 +52,7 @@ class Galleroob(ReplApplication):
COPYRIGHT = u'Copyright(C) 2011 Noé Rubinstein'
DESCRIPTION = 'galleroob browses and downloads web image galleries'
SHORT_DESCRIPTION = 'browse and download web image galleries'
- CAPS = ICapGallery
+ CAPS = CapGallery
EXTRA_FORMATTERS = {'gallery_list': GalleryListFormatter}
COMMANDS_FORMATTERS = {'search': 'gallery_list', 'ls': 'gallery_list'}
COLLECTION_OBJECTS = (BaseGallery, BaseImage, )
diff --git a/weboob/applications/geolooc/geolooc.py b/weboob/applications/geolooc/geolooc.py
index c402a73c3a7e6df58e0c585facc384ba7bb89310..bbfdbf35ffefa64ea2ee20df10d86a1a0055060d 100644
--- a/weboob/applications/geolooc/geolooc.py
+++ b/weboob/applications/geolooc/geolooc.py
@@ -20,7 +20,7 @@
import sys
-from weboob.capabilities.geolocip import ICapGeolocIp
+from weboob.capabilities.geolocip import CapGeolocIp
from weboob.tools.application.repl import ReplApplication
@@ -33,7 +33,7 @@ class Geolooc(ReplApplication):
COPYRIGHT = 'Copyright(C) 2010-2011 Romain Bignon'
DESCRIPTION = "Console application allowing to geolocalize IP addresses."
SHORT_DESCRIPTION = "geolocalize IP addresses"
- CAPS = ICapGeolocIp
+ CAPS = CapGeolocIp
def main(self, argv):
if len(argv) < 2:
diff --git a/weboob/applications/handjoob/handjoob.py b/weboob/applications/handjoob/handjoob.py
index bf4c19b55a9cbf183cb4fe663fcef1648cab722b..fb113eecf06c7cd0690242797bf7e19257115ec2 100644
--- a/weboob/applications/handjoob/handjoob.py
+++ b/weboob/applications/handjoob/handjoob.py
@@ -19,7 +19,7 @@
import sys
-from weboob.capabilities.job import ICapJob
+from weboob.capabilities.job import CapJob
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
@@ -79,7 +79,7 @@ class Handjoob(ReplApplication):
COPYRIGHT = 'Copyright(C) 2012 Bezleputh'
DESCRIPTION = "Console application to search for a job."
SHORT_DESCRIPTION = "search for a job"
- CAPS = ICapJob
+ CAPS = CapJob
EXTRA_FORMATTERS = {'job_advert_list': JobAdvertListFormatter,
'job_advert': JobAdvertFormatter,
}
diff --git a/weboob/applications/havedate/havedate.py b/weboob/applications/havedate/havedate.py
index 2af169690ab8dbd6a2b208929d2d7999ea0513be..8818b4b1a1278123846480b783e8296273f37cf0 100644
--- a/weboob/applications/havedate/havedate.py
+++ b/weboob/applications/havedate/havedate.py
@@ -24,7 +24,7 @@
from weboob.core import CallErrors
from weboob.tools.application.repl import ReplApplication
from weboob.applications.boobmsg import Boobmsg
-from weboob.capabilities.dating import ICapDating, OptimizationNotFound
+from weboob.capabilities.dating import CapDating, OptimizationNotFound
from weboob.tools.application.formatters.iformatter import PrettyFormatter
@@ -55,7 +55,7 @@ class HaveDate(Boobmsg):
SHORT_DESCRIPTION = "interact with dating websites"
STORAGE_FILENAME = 'dating.storage'
STORAGE = {'optims': {}}
- CAPS = ICapDating
+ CAPS = CapDating
EXTRA_FORMATTERS = copy(Boobmsg.EXTRA_FORMATTERS)
EXTRA_FORMATTERS['events'] = EventListFormatter
COMMANDS_FORMATTERS = copy(Boobmsg.COMMANDS_FORMATTERS)
@@ -63,7 +63,7 @@ class HaveDate(Boobmsg):
COMMANDS_FORMATTERS['events'] = 'events'
def load_default_backends(self):
- self.load_backends(ICapDating, storage=self.create_storage(self.STORAGE_FILENAME))
+ self.load_backends(CapDating, storage=self.create_storage(self.STORAGE_FILENAME))
def main(self, argv):
self.load_config()
diff --git a/weboob/applications/masstransit/masstransit.py b/weboob/applications/masstransit/masstransit.py
index 9a9d235aeeea78f3d6867f360e4c28a8f0fbcc17..90d913ed2a4aaa543319835356e69fd9b0df802e 100644
--- a/weboob/applications/masstransit/masstransit.py
+++ b/weboob/applications/masstransit/masstransit.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.travel import ICapTravel
+from weboob.capabilities.travel import CapTravel
from weboob.tools.application.base import BaseApplication
from logging import warning
@@ -284,6 +284,6 @@ class Masstransit(BaseApplication):
SHORT_DESCRIPTION = "search for train stations and departures"
def main(self, argv):
- self.load_backends(ICapTravel)
+ self.load_backends(CapTravel)
MasstransitHildon(self.weboob)
gtk.main()
diff --git a/weboob/applications/monboob/monboob.py b/weboob/applications/monboob/monboob.py
index c2eadd5d082840e155f93e7d203ced0d123d6da1..68d8c63e27d2822e78e988e2401ff5c623c1dacb 100644
--- a/weboob/applications/monboob/monboob.py
+++ b/weboob/applications/monboob/monboob.py
@@ -34,7 +34,7 @@
from weboob.core import Weboob, CallErrors
from weboob.core.scheduler import Scheduler
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Thread, Message
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Thread, Message
from weboob.tools.application.repl import ReplApplication
from weboob.tools.misc import html2text, get_backtrace, utc2local, to_unicode
@@ -98,7 +98,7 @@ class Monboob(ReplApplication):
'smtp': 'localhost',
'pipe': '',
'html': 0}
- CAPS = ICapMessages
+ CAPS = CapMessages
DISABLE_REPL = True
def add_application_options(self, group):
@@ -108,7 +108,7 @@ def create_weboob(self):
return Weboob(scheduler=MonboobScheduler(self))
def load_default_backends(self):
- self.load_backends(ICapMessages, storage=self.create_storage())
+ self.load_backends(CapMessages, storage=self.create_storage())
def main(self, argv):
self.load_config()
@@ -221,8 +221,8 @@ def process_incoming_mail(self, msg):
print >>sys.stderr, 'Backend %s not found' % bname
return 1
- if not backend.has_caps(ICapMessagesPost):
- print >>sys.stderr, 'The backend %s does not implement ICapMessagesPost' % bname
+ if not backend.has_caps(CapMessagesPost):
+ print >>sys.stderr, 'The backend %s does not implement CapMessagesPost' % bname
return 1
thread = Thread(thread_id)
diff --git a/weboob/applications/parceloob/parceloob.py b/weboob/applications/parceloob/parceloob.py
index d146d9bd42d161b58e5cc8a83d2e6451a0fe47bd..f460328b1a00a3d7f3e7d7ae00ba2b3ff3bf25ba 100644
--- a/weboob/applications/parceloob/parceloob.py
+++ b/weboob/applications/parceloob/parceloob.py
@@ -21,7 +21,7 @@
import sys
from weboob.capabilities.base import empty
-from weboob.capabilities.parcel import ICapParcel, Parcel
+from weboob.capabilities.parcel import CapParcel, Parcel
from weboob.tools.application.repl import ReplApplication
from weboob.tools.application.formatters.iformatter import IFormatter
@@ -86,7 +86,7 @@ class Parceloob(ReplApplication):
APPNAME = 'parceloob'
VERSION = '0.j'
COPYRIGHT = 'Copyright(C) 2013 Romain Bignon'
- CAPS = ICapParcel
+ CAPS = CapParcel
DESCRIPTION = "Console application to track your parcels."
SHORT_DESCRIPTION = "manage your parcels"
EXTRA_FORMATTERS = {'status': StatusFormatter,
diff --git a/weboob/applications/pastoob/pastoob.py b/weboob/applications/pastoob/pastoob.py
index 0b7292000e131987de1f616f6f4a9d9bfc4f5d7d..c0c4bed03ef7d47e9b7861d7179a9a33f94ca79a 100644
--- a/weboob/applications/pastoob/pastoob.py
+++ b/weboob/applications/pastoob/pastoob.py
@@ -25,7 +25,7 @@
import re
from random import choice
-from weboob.capabilities.paste import ICapPaste, PasteNotFound
+from weboob.capabilities.paste import CapPaste, PasteNotFound
from weboob.tools.application.repl import ReplApplication
@@ -38,7 +38,7 @@ class Pastoob(ReplApplication):
COPYRIGHT = 'Copyright(C) 2011-2013 Laurent Bachelier'
DESCRIPTION = "Console application allowing to post and get pastes from pastebins."
SHORT_DESCRIPTION = "post and get pastes from pastebins"
- CAPS = ICapPaste
+ CAPS = CapPaste
def main(self, argv):
self.load_config()
diff --git a/weboob/applications/qboobmsg/main_window.py b/weboob/applications/qboobmsg/main_window.py
index 6cd5ddc40d992772b327a6f09a533aed0b088997..c0a585fb98bee81e07fb602bf02afbccaac29f77 100644
--- a/weboob/applications/qboobmsg/main_window.py
+++ b/weboob/applications/qboobmsg/main_window.py
@@ -21,7 +21,7 @@
from weboob.tools.application.qt import QtMainWindow
from weboob.tools.application.qt.backendcfg import BackendCfg
-from weboob.capabilities.messages import ICapMessages
+from weboob.capabilities.messages import CapMessages
from .ui.main_window_ui import Ui_MainWindow
from .messages_manager import MessagesManager
@@ -48,7 +48,7 @@ def __init__(self, config, weboob, parent=None):
self.centralWidget().load()
def backendsConfig(self):
- bckndcfg = BackendCfg(self.weboob, (ICapMessages,), self)
+ bckndcfg = BackendCfg(self.weboob, (CapMessages,), self)
if bckndcfg.run():
self.centralWidget().load()
diff --git a/weboob/applications/qboobmsg/messages_manager.py b/weboob/applications/qboobmsg/messages_manager.py
index 3aa4d8ae1b4410279cc4af1ca070e4c08b99f9b2..da89bcb088ac61f9d8523dab189d149f48e5a915 100644
--- a/weboob/applications/qboobmsg/messages_manager.py
+++ b/weboob/applications/qboobmsg/messages_manager.py
@@ -23,7 +23,7 @@
from PyQt4.QtGui import QWidget, QTreeWidgetItem, QListWidgetItem, QMessageBox, QBrush
from PyQt4.QtCore import SIGNAL, Qt
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Message
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message
from weboob.tools.application.qt import QtDo
from weboob.tools.misc import to_unicode
@@ -58,7 +58,7 @@ def load(self):
self.ui.backendsList.clear()
self.ui.backendsList.addItem('(All)')
for backend in self.weboob.iter_backends():
- if not backend.has_caps(ICapMessages):
+ if not backend.has_caps(CapMessages):
continue
item = QListWidgetItem(backend.name.capitalize())
@@ -87,7 +87,7 @@ def refreshThreads(self):
self.ui.threadsList.setEnabled(False)
self.process_threads = QtDo(self.weboob, self._gotThread)
- self.process_threads.do('iter_threads', backends=self.backend, caps=ICapMessages)
+ self.process_threads.do('iter_threads', backends=self.backend, caps=CapMessages)
def _gotThread(self, backend, thread):
if not backend:
@@ -166,7 +166,7 @@ def _messageSelected(self, item, column):
def showMessage(self, message, item=None):
backend = self.weboob.get_backend(message.thread.backend)
- if backend.has_caps(ICapMessagesPost):
+ if backend.has_caps(CapMessagesPost):
self.ui.replyButton.setEnabled(True)
self.message = message
diff --git a/weboob/applications/qboobmsg/qboobmsg.py b/weboob/applications/qboobmsg/qboobmsg.py
index f9f00b13dbd58a162c81dac9154ffee3439340f4..a9b4e461684e88e8506c8d5ad19db77d323c903b 100644
--- a/weboob/applications/qboobmsg/qboobmsg.py
+++ b/weboob/applications/qboobmsg/qboobmsg.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.messages import ICapMessages
+from weboob.capabilities.messages import CapMessages
from weboob.tools.application.qt import QtApplication
from .main_window import MainWindow
@@ -30,10 +30,10 @@ class QBoobMsg(QtApplication):
COPYRIGHT = 'Copyright(C) 2010-2011 Romain Bignon'
DESCRIPTION = "Qt application allowing to read messages on various websites and reply to them."
SHORT_DESCRIPTION = "send and receive message threads"
- CAPS = ICapMessages
+ CAPS = CapMessages
def main(self, argv):
- self.load_backends(ICapMessages, storage=self.create_storage())
+ self.load_backends(CapMessages, storage=self.create_storage())
self.main_window = MainWindow(self.config, self.weboob)
self.main_window.show()
diff --git a/weboob/applications/qcineoob/main_window.py b/weboob/applications/qcineoob/main_window.py
index 94cfe61683601e25698033c19fe2a988b26e4775..54935f0f2550e5997aa0af7f5bbd5966a189869e 100644
--- a/weboob/applications/qcineoob/main_window.py
+++ b/weboob/applications/qcineoob/main_window.py
@@ -23,9 +23,9 @@
from PyQt4.QtCore import SIGNAL, Qt, QStringList
from PyQt4.QtGui import QApplication, QCompleter, QFrame, QShortcut, QKeySequence
-from weboob.capabilities.cinema import ICapCinema
-from weboob.capabilities.torrent import ICapTorrent
-from weboob.capabilities.subtitle import ICapSubtitle
+from weboob.capabilities.cinema import CapCinema
+from weboob.capabilities.torrent import CapTorrent
+from weboob.capabilities.subtitle import CapSubtitle
from weboob.tools.application.qt import QtMainWindow, QtDo
from weboob.tools.application.qt.backendcfg import BackendCfg
@@ -99,7 +99,7 @@ def castingAction(self, backend_name, id, role):
QApplication.setOverrideCursor(Qt.WaitCursor)
self.process = QtDo(self.weboob, self.addPerson)
- self.process.do('iter_movie_persons', id, role, backends=backend_name, caps=ICapCinema)
+ self.process.do('iter_movie_persons', id, role, backends=backend_name, caps=CapCinema)
self.parent.ui.stopButton.show()
def filmographyAction(self, backend_name, id, role):
@@ -114,7 +114,7 @@ def filmographyAction(self, backend_name, id, role):
QApplication.setOverrideCursor(Qt.WaitCursor)
self.process = QtDo(self.weboob, self.addMovie)
- self.process.do('iter_person_movies', id, role, backends=backend_name, caps=ICapCinema)
+ self.process.do('iter_person_movies', id, role, backends=backend_name, caps=CapCinema)
self.parent.ui.stopButton.show()
def search(self, tosearch, pattern, lang):
@@ -146,8 +146,8 @@ def searchMovieAction(self, pattern):
backend_name = str(self.parent.ui.backendEdit.itemData(self.parent.ui.backendEdit.currentIndex()).toString())
self.process = QtDo(self.weboob, self.addMovie)
- #self.process.do('iter_movies', pattern, backends=backend_name, caps=ICapCinema)
- self.process.do(self.app._do_complete, self.parent.getCount(), ('original_title'), 'iter_movies', pattern, backends=backend_name, caps=ICapCinema)
+ #self.process.do('iter_movies', pattern, backends=backend_name, caps=CapCinema)
+ self.process.do(self.app._do_complete, self.parent.getCount(), ('original_title'), 'iter_movies', pattern, backends=backend_name, caps=CapCinema)
self.parent.ui.stopButton.show()
def stopProcess(self):
@@ -194,8 +194,8 @@ def searchPersonAction(self, pattern):
backend_name = str(self.parent.ui.backendEdit.itemData(self.parent.ui.backendEdit.currentIndex()).toString())
self.process = QtDo(self.weboob, self.addPerson)
- #self.process.do('iter_persons', pattern, backends=backend_name, caps=ICapCinema)
- self.process.do(self.app._do_complete, self.parent.getCount(), ('name'), 'iter_persons', pattern, backends=backend_name, caps=ICapCinema)
+ #self.process.do('iter_persons', pattern, backends=backend_name, caps=CapCinema)
+ self.process.do(self.app._do_complete, self.parent.getCount(), ('name'), 'iter_persons', pattern, backends=backend_name, caps=CapCinema)
self.parent.ui.stopButton.show()
def addPerson(self, backend, person):
@@ -239,8 +239,8 @@ def searchTorrentAction(self, pattern):
backend_name = str(self.parent.ui.backendEdit.itemData(self.parent.ui.backendEdit.currentIndex()).toString())
self.process = QtDo(self.weboob, self.addTorrent)
- #self.process.do('iter_torrents', pattern, backends=backend_name, caps=ICapTorrent)
- self.process.do(self.app._do_complete, self.parent.getCount(), ('name'), 'iter_torrents', pattern, backends=backend_name, caps=ICapTorrent)
+ #self.process.do('iter_torrents', pattern, backends=backend_name, caps=CapTorrent)
+ self.process.do(self.app._do_complete, self.parent.getCount(), ('name'), 'iter_torrents', pattern, backends=backend_name, caps=CapTorrent)
self.parent.ui.stopButton.show()
def addTorrent(self, backend, torrent):
@@ -283,8 +283,8 @@ def searchSubtitleAction(self, lang, pattern):
backend_name = str(self.parent.ui.backendEdit.itemData(self.parent.ui.backendEdit.currentIndex()).toString())
self.process = QtDo(self.weboob, self.addSubtitle)
- #self.process.do('iter_subtitles', lang, pattern, backends=backend_name, caps=ICapSubtitle)
- self.process.do(self.app._do_complete, self.parent.getCount(), ('name'), 'iter_subtitles', lang, pattern, backends=backend_name, caps=ICapSubtitle)
+ #self.process.do('iter_subtitles', lang, pattern, backends=backend_name, caps=CapSubtitle)
+ self.process.do(self.app._do_complete, self.parent.getCount(), ('name'), 'iter_subtitles', lang, pattern, backends=backend_name, caps=CapSubtitle)
self.parent.ui.stopButton.show()
def addSubtitle(self, backend, subtitle):
@@ -312,14 +312,14 @@ def searchId(self, id, stype):
QApplication.setOverrideCursor(Qt.WaitCursor)
title_field = 'name'
if stype == 'movie':
- cap = ICapCinema
+ cap = CapCinema
title_field = 'original_title'
elif stype == 'person':
- cap = ICapCinema
+ cap = CapCinema
elif stype == 'torrent':
- cap = ICapTorrent
+ cap = CapTorrent
elif stype == 'subtitle':
- cap = ICapSubtitle
+ cap = CapSubtitle
if '@' in id:
backend_name = id.split('@')[1]
id = id.split('@')[0]
@@ -455,7 +455,7 @@ def searchId(self):
new_res.searchId(id, stype)
def backendsConfig(self):
- bckndcfg = BackendCfg(self.weboob, (ICapCinema, ICapTorrent, ICapSubtitle,), self)
+ bckndcfg = BackendCfg(self.weboob, (CapCinema, CapTorrent, CapSubtitle,), self)
if bckndcfg.run():
self.loadBackendsList()
diff --git a/weboob/applications/qcineoob/qcineoob.py b/weboob/applications/qcineoob/qcineoob.py
index 635901728468b14ade2195e708e7c673e4afca1f..65b9fe2ccbee4391e69a398c90769aa557fda2e2 100644
--- a/weboob/applications/qcineoob/qcineoob.py
+++ b/weboob/applications/qcineoob/qcineoob.py
@@ -18,9 +18,9 @@
# along with weboob. If not, see .
-from weboob.capabilities.cinema import ICapCinema
-from weboob.capabilities.torrent import ICapTorrent
-from weboob.capabilities.subtitle import ICapSubtitle
+from weboob.capabilities.cinema import CapCinema
+from weboob.capabilities.torrent import CapTorrent
+from weboob.capabilities.subtitle import CapSubtitle
from weboob.tools.application.qt import QtApplication
from .main_window import MainWindow
@@ -32,7 +32,7 @@ class QCineoob(QtApplication):
COPYRIGHT = 'Copyright(C) 2013 Julien Veyssier'
DESCRIPTION = "Qt application allowing to search movies, people, torrent and subtitles."
SHORT_DESCRIPTION = "search movies, people, torrent and subtitles"
- CAPS = ICapCinema, ICapTorrent, ICapSubtitle
+ CAPS = CapCinema, CapTorrent, CapSubtitle
CONFIG = {'settings': {'backend': '',
'maxresultsnumber': '10',
'showthumbnails': '0'
@@ -40,7 +40,7 @@ class QCineoob(QtApplication):
}
def main(self, argv):
- self.load_backends([ICapCinema, ICapTorrent, ICapSubtitle])
+ self.load_backends([CapCinema, CapTorrent, CapSubtitle])
self.load_config()
self.main_window = MainWindow(self.config, self.weboob, self)
diff --git a/weboob/applications/qcookboob/main_window.py b/weboob/applications/qcookboob/main_window.py
index d58c23beab00b042e61f832a7c0cafa63b4aae43..b7ce3ad3d64d15a9e1d5d1d61095b5adf3fae64d 100644
--- a/weboob/applications/qcookboob/main_window.py
+++ b/weboob/applications/qcookboob/main_window.py
@@ -23,7 +23,7 @@
from PyQt4.QtCore import SIGNAL, Qt, QStringList
from PyQt4.QtGui import QApplication, QCompleter
-from weboob.capabilities.recipe import ICapRecipe
+from weboob.capabilities.recipe import CapRecipe
from weboob.tools.application.qt import QtMainWindow, QtDo
from weboob.tools.application.qt.backendcfg import BackendCfg
@@ -72,7 +72,7 @@ def __init__(self, config, weboob, app, parent=None):
self.backendsConfig()
def backendsConfig(self):
- bckndcfg = BackendCfg(self.weboob, (ICapRecipe, ), self)
+ bckndcfg = BackendCfg(self.weboob, (CapRecipe, ), self)
if bckndcfg.run():
self.loadBackendsList()
@@ -184,7 +184,7 @@ def searchRecipeAction(self, pattern):
backend_name = str(self.ui.backendEdit.itemData(self.ui.backendEdit.currentIndex()).toString())
self.process = QtDo(self.weboob, self.addRecipe)
- self.process.do(self.app._do_complete, self.getCount(), ('title'), 'iter_recipes', pattern, backends=backend_name, caps=ICapRecipe)
+ self.process.do(self.app._do_complete, self.getCount(), ('title'), 'iter_recipes', pattern, backends=backend_name, caps=CapRecipe)
self.ui.stopButton.show()
def addRecipe(self, backend, recipe):
diff --git a/weboob/applications/qcookboob/qcookboob.py b/weboob/applications/qcookboob/qcookboob.py
index 29e031390bb14e3a5b1362075828beaa0614442c..610b674ec9b392de093eeaf84ecda1a5b299da50 100644
--- a/weboob/applications/qcookboob/qcookboob.py
+++ b/weboob/applications/qcookboob/qcookboob.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.recipe import ICapRecipe
+from weboob.capabilities.recipe import CapRecipe
from weboob.tools.application.qt import QtApplication
from .main_window import MainWindow
@@ -30,14 +30,14 @@ class QCookboob(QtApplication):
COPYRIGHT = 'Copyright(C) 2013 Julien Veyssier'
DESCRIPTION = "Qt application allowing to search recipes."
SHORT_DESCRIPTION = "search recipes"
- CAPS = ICapRecipe
+ CAPS = CapRecipe
CONFIG = {'settings': {'backend': '',
'maxresultsnumber': '10'
}
}
def main(self, argv):
- self.load_backends([ICapRecipe])
+ self.load_backends([CapRecipe])
self.load_config()
self.main_window = MainWindow(self.config, self.weboob, self)
diff --git a/weboob/applications/qflatboob/main_window.py b/weboob/applications/qflatboob/main_window.py
index 5f1ca454773181cace4ca489a83f144dd2909d9c..d4c018fbffb9a6352266e05e8a78963915627caa 100644
--- a/weboob/applications/qflatboob/main_window.py
+++ b/weboob/applications/qflatboob/main_window.py
@@ -24,7 +24,7 @@
from weboob.tools.application.qt import QtMainWindow, QtDo, HTMLDelegate
from weboob.tools.application.qt.backendcfg import BackendCfg
-from weboob.capabilities.housing import ICapHousing, Query, City
+from weboob.capabilities.housing import CapHousing, Query, City
from weboob.capabilities.base import NotLoaded, NotAvailable
from .ui.main_window_ui import Ui_MainWindow
@@ -101,7 +101,7 @@ def closeEvent(self, event):
QtMainWindow.closeEvent(self, event)
def backendsConfig(self):
- bckndcfg = BackendCfg(self.weboob, (ICapHousing,), self)
+ bckndcfg = BackendCfg(self.weboob, (CapHousing,), self)
if bckndcfg.run():
pass
diff --git a/weboob/applications/qflatboob/qflatboob.py b/weboob/applications/qflatboob/qflatboob.py
index 3237757d3665b9deab545e23c84211f59a27d9bd..023d71b2a0d3ab622a2e0e7c7390b636edfb0103 100644
--- a/weboob/applications/qflatboob/qflatboob.py
+++ b/weboob/applications/qflatboob/qflatboob.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.housing import ICapHousing
+from weboob.capabilities.housing import CapHousing
from weboob.tools.application.qt import QtApplication
from weboob.tools.config.yamlconfig import YamlConfig
@@ -31,12 +31,12 @@ class QFlatBoob(QtApplication):
COPYRIGHT = 'Copyright(C) 2010-2012 Romain Bignon'
DESCRIPTION = "Qt application to search for housing."
SHORT_DESCRIPTION = "search for housing"
- CAPS = ICapHousing
+ CAPS = CapHousing
CONFIG = {'queries': {}}
STORAGE = {'bookmarks': [], 'read': [], 'notes': {}}
def main(self, argv):
- self.load_backends(ICapHousing)
+ self.load_backends(CapHousing)
self.create_storage()
self.load_config(klass=YamlConfig)
diff --git a/weboob/applications/qhandjoob/main_window.py b/weboob/applications/qhandjoob/main_window.py
index 8958dc9b56271316a4ff854e553cab7860a95520..66ddb51972a20fb28cb71fc018b98ea70cbeff1e 100644
--- a/weboob/applications/qhandjoob/main_window.py
+++ b/weboob/applications/qhandjoob/main_window.py
@@ -22,7 +22,7 @@
from weboob.tools.application.qt import QtMainWindow, QtDo
from weboob.tools.application.qt.backendcfg import BackendCfg
-from weboob.capabilities.job import ICapJob
+from weboob.capabilities.job import CapJob
from .ui.main_window_ui import Ui_MainWindow
@@ -167,7 +167,7 @@ def closeEvent(self, event):
QtMainWindow.closeEvent(self, event)
def backendsConfig(self):
- bckndcfg = BackendCfg(self.weboob, (ICapJob,), self)
+ bckndcfg = BackendCfg(self.weboob, (CapJob,), self)
if bckndcfg.run():
pass
diff --git a/weboob/applications/qhandjoob/qhandjoob.py b/weboob/applications/qhandjoob/qhandjoob.py
index 918143a3fd2d4754a364b1ce9e33e818b9a80c46..09d241286bebbeed0b0399e544741ced7497d6c9 100644
--- a/weboob/applications/qhandjoob/qhandjoob.py
+++ b/weboob/applications/qhandjoob/qhandjoob.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.job import ICapJob
+from weboob.capabilities.job import CapJob
from weboob.tools.application.qt import QtApplication
from weboob.tools.config.yamlconfig import YamlConfig
@@ -31,12 +31,12 @@ class QHandJoob(QtApplication):
COPYRIGHT = u'Copyright(C) 2013 Sébastien Monel'
DESCRIPTION = "Qt application to search for job."
SHORT_DESCRIPTION = "search for job"
- CAPS = ICapJob
+ CAPS = CapJob
CONFIG = {'queries': {}}
STORAGE = {'bookmarks': [], 'read': [], 'notes': {}}
def main(self, argv):
- self.load_backends(ICapJob)
+ self.load_backends(CapJob)
self.create_storage()
self.load_config(klass=YamlConfig)
diff --git a/weboob/applications/qhavedate/contacts.py b/weboob/applications/qhavedate/contacts.py
index 0e06d78e75ec229a9fbf97064d552dc3bd814b8c..ccc166fe66f35ea5719cae7b5eb0f580763625c1 100644
--- a/weboob/applications/qhavedate/contacts.py
+++ b/weboob/applications/qhavedate/contacts.py
@@ -26,9 +26,9 @@
from weboob.tools.application.qt import QtDo, HTMLDelegate
from weboob.tools.misc import to_unicode
-from weboob.capabilities.contact import ICapContact, Contact
-from weboob.capabilities.chat import ICapChat
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Message
+from weboob.capabilities.contact import CapContact, Contact
+from weboob.capabilities.chat import CapChat
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message
from weboob.capabilities.base import NotLoaded
from .ui.contacts_ui import Ui_Contacts
@@ -426,7 +426,7 @@ def iter_contacts(self, cb):
status = Contact.STATUS_ALL
self.process = QtDo(self.weboob, lambda b, d: self.cb(cb, b, d))
- self.process.do('iter_contacts', status, caps=ICapContact)
+ self.process.do('iter_contacts', status, caps=CapContact)
def cb(self, cb, backend, contact):
if contact:
@@ -559,9 +559,9 @@ def setContact(self, contact):
backend = self.weboob.get_backend(self.contact.backend)
self.ui.tabWidget.addTab(ContactProfile(self.weboob, self.contact), self.tr('Profile'))
- if backend.has_caps(ICapMessages):
- self.ui.tabWidget.addTab(ContactThread(self.weboob, self.contact, backend.has_caps(ICapMessagesPost)), self.tr('Messages'))
- if backend.has_caps(ICapChat):
+ if backend.has_caps(CapMessages):
+ self.ui.tabWidget.addTab(ContactThread(self.weboob, self.contact, backend.has_caps(CapMessagesPost)), self.tr('Messages'))
+ if backend.has_caps(CapChat):
self.ui.tabWidget.setTabEnabled(self.ui.tabWidget.addTab(QWidget(), self.tr('Chat')),
False)
self.ui.tabWidget.setTabEnabled(self.ui.tabWidget.addTab(QWidget(), self.tr('Calendar')),
diff --git a/weboob/applications/qhavedate/main_window.py b/weboob/applications/qhavedate/main_window.py
index 378ab75ab4f7f2d2eb65a0415fbee48108e4ff95..55dc5557ce9f0b71b03912cc5dc82e38e6933003 100644
--- a/weboob/applications/qhavedate/main_window.py
+++ b/weboob/applications/qhavedate/main_window.py
@@ -22,7 +22,7 @@
from weboob.tools.application.qt import QtMainWindow
from weboob.tools.application.qt.backendcfg import BackendCfg
-from weboob.capabilities.dating import ICapDating
+from weboob.capabilities.dating import CapDating
try:
from weboob.applications.qboobmsg.messages_manager import MessagesManager
@@ -61,7 +61,7 @@ def __init__(self, config, weboob, parent=None):
self.backendsConfig()
def backendsConfig(self):
- bckndcfg = BackendCfg(self.weboob, (ICapDating,), self)
+ bckndcfg = BackendCfg(self.weboob, (CapDating,), self)
if bckndcfg.run():
self.loaded_tabs.clear()
widget = self.ui.tabWidget.widget(self.ui.tabWidget.currentIndex())
diff --git a/weboob/applications/qhavedate/qhavedate.py b/weboob/applications/qhavedate/qhavedate.py
index b585e6da21e3ce232d0c808a68a190c339289dc0..f707d3571e0391fe7b13e270756f21d0b27038cb 100644
--- a/weboob/applications/qhavedate/qhavedate.py
+++ b/weboob/applications/qhavedate/qhavedate.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.dating import ICapDating
+from weboob.capabilities.dating import CapDating
from weboob.tools.application.qt import QtApplication
from .main_window import MainWindow
@@ -30,12 +30,12 @@ class QHaveDate(QtApplication):
COPYRIGHT = 'Copyright(C) 2010-2012 Romain Bignon'
DESCRIPTION = "Qt application allowing to interact with various dating websites."
SHORT_DESCRIPTION = "interact with dating websites"
- CAPS = ICapDating
+ CAPS = CapDating
STORAGE_FILENAME = 'dating.storage'
def main(self, argv):
self.create_storage(self.STORAGE_FILENAME)
- self.load_backends(ICapDating)
+ self.load_backends(CapDating)
self.main_window = MainWindow(self.config, self.weboob)
self.main_window.show()
diff --git a/weboob/applications/qhavedate/status.py b/weboob/applications/qhavedate/status.py
index dbef05e415d7ca8b5a8a2a0cea03a8bd32cece89..3498327fe180b010356d50c62e9331d8c1686fc6 100644
--- a/weboob/applications/qhavedate/status.py
+++ b/weboob/applications/qhavedate/status.py
@@ -20,7 +20,7 @@
from PyQt4.QtGui import QScrollArea, QWidget, QHBoxLayout, QVBoxLayout, QFrame, QLabel, QImage, QPixmap
-from weboob.capabilities.account import ICapAccount, StatusField
+from weboob.capabilities.account import CapAccount, StatusField
from weboob.tools.application.qt import QtDo
from weboob.tools.misc import to_unicode
@@ -55,7 +55,7 @@ def __init__(self, weboob, backend, parent=None):
self.layout().addWidget(headw)
- if backend.has_caps(ICapAccount):
+ if backend.has_caps(CapAccount):
self.body.setText(u'Waiting...')
self.layout().addWidget(self.body)
diff --git a/weboob/applications/qvideoob/main_window.py b/weboob/applications/qvideoob/main_window.py
index 91437ad0a8426f76066ad2d9542fa7a32410bfe3..4fcc80f7d2c1cae5c22d69d679bea39a4d70039e 100644
--- a/weboob/applications/qvideoob/main_window.py
+++ b/weboob/applications/qvideoob/main_window.py
@@ -20,7 +20,7 @@
from PyQt4.QtCore import SIGNAL
-from weboob.capabilities.video import ICapVideo
+from weboob.capabilities.video import CapVideo
from weboob.tools.application.qt import QtMainWindow, QtDo
from weboob.tools.application.qt.backendcfg import BackendCfg
@@ -58,7 +58,7 @@ def __init__(self, config, weboob, app, parent=None):
self.backendsConfig()
def backendsConfig(self):
- bckndcfg = BackendCfg(self.weboob, (ICapVideo,), self)
+ bckndcfg = BackendCfg(self.weboob, (CapVideo,), self)
if bckndcfg.run():
self.loadBackendsList()
diff --git a/weboob/applications/qvideoob/qvideoob.py b/weboob/applications/qvideoob/qvideoob.py
index b7e323434c7455d3946ad2123d0de695c68e1d40..21865c9735168184ce94943764e06496c8ef76ef 100644
--- a/weboob/applications/qvideoob/qvideoob.py
+++ b/weboob/applications/qvideoob/qvideoob.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.video import ICapVideo
+from weboob.capabilities.video import CapVideo
from weboob.tools.application.qt import QtApplication
from .main_window import MainWindow
@@ -30,7 +30,7 @@ class QVideoob(QtApplication):
COPYRIGHT = 'Copyright(C) 2010-2011 Romain Bignon'
DESCRIPTION = "Qt application allowing to search videos on various websites and play them."
SHORT_DESCRIPTION = "search and play videos"
- CAPS = ICapVideo
+ CAPS = CapVideo
CONFIG = {'settings': {'nsfw': 1,
'sfw': 1,
'sortby': 0,
@@ -39,7 +39,7 @@ class QVideoob(QtApplication):
}
def main(self, argv):
- self.load_backends(ICapVideo)
+ self.load_backends(CapVideo)
self.load_config()
self.main_window = MainWindow(self.config, self.weboob, self)
diff --git a/weboob/applications/qwebcontentedit/main_window.py b/weboob/applications/qwebcontentedit/main_window.py
index e27449e30b9f677c4d9caf5dc2962699fdc4cdcc..cded3645bdb510182ab7be1e72d4af3d8c734953 100644
--- a/weboob/applications/qwebcontentedit/main_window.py
+++ b/weboob/applications/qwebcontentedit/main_window.py
@@ -26,7 +26,7 @@
from weboob.tools.application.base import MoreResultsAvailable
from weboob.tools.application.qt import QtMainWindow, QtDo
from weboob.tools.application.qt.backendcfg import BackendCfg
-from weboob.capabilities.content import ICapContent
+from weboob.capabilities.content import CapContent
from weboob.tools.misc import to_unicode
from .ui.main_window_ui import Ui_MainWindow
@@ -75,7 +75,7 @@ def __init__(self, config, weboob, app, parent=None):
def backendsConfig(self):
""" Opens backends configuration dialog when 'Backends' is clicked """
- bckndcfg = BackendCfg(self.weboob, (ICapContent,), self)
+ bckndcfg = BackendCfg(self.weboob, (CapContent,), self)
if bckndcfg.run():
self.loadBackends()
diff --git a/weboob/applications/qwebcontentedit/qwebcontentedit.py b/weboob/applications/qwebcontentedit/qwebcontentedit.py
index c72213e116fa1b0486280e5c5a1e9e9fea5ac58f..e7d840a65fec16b747d16a796199c577063aa0a7 100644
--- a/weboob/applications/qwebcontentedit/qwebcontentedit.py
+++ b/weboob/applications/qwebcontentedit/qwebcontentedit.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
from weboob.tools.application.qt import QtApplication
-from weboob.capabilities.content import ICapContent
+from weboob.capabilities.content import CapContent
from .main_window import MainWindow
@@ -29,10 +29,10 @@ class QWebContentEdit(QtApplication):
COPYRIGHT = u'Copyright(C) 2011 Clément Schreiner'
DESCRIPTION = "Qt application allowing to manage content of various websites."
SHORT_DESCRIPTION = "manage websites content"
- CAPS = ICapContent
+ CAPS = CapContent
def main(self, argv):
- self.load_backends(ICapContent, storage=self.create_storage())
+ self.load_backends(CapContent, storage=self.create_storage())
self.main_window = MainWindow(self.config, self.weboob, self)
self.main_window.show()
return self.weboob.loop()
diff --git a/weboob/applications/radioob/radioob.py b/weboob/applications/radioob/radioob.py
index 2e38d7a040e2fbd36f5ca102973e2671f5b59d50..85f8bf9d29642a51c4da41c54017c8af51b58d71 100644
--- a/weboob/applications/radioob/radioob.py
+++ b/weboob/applications/radioob/radioob.py
@@ -23,8 +23,8 @@
import re
import requests
-from weboob.capabilities.radio import ICapRadio, Radio
-from weboob.capabilities.audio import ICapAudio, BaseAudio, Playlist, Album
+from weboob.capabilities.radio import CapRadio, Radio
+from weboob.capabilities.audio import CapAudio, BaseAudio, Playlist, Album
from weboob.capabilities.base import empty
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.media_player import InvalidMediaPlayer, MediaPlayer, MediaPlayerNotFound
@@ -129,7 +129,7 @@ class Radioob(ReplApplication):
DESCRIPTION = "Console application allowing to search for web radio stations, listen to them and get information " \
"like the current song."
SHORT_DESCRIPTION = "search, show or listen to radio stations"
- CAPS = (ICapRadio, ICapAudio)
+ CAPS = (CapRadio, CapAudio)
EXTRA_FORMATTERS = {'radio_list': RadioListFormatter,
'song_list': SongListFormatter,
'album_tracks_list_info': AlbumTrackListInfoFormatter,
@@ -301,7 +301,7 @@ def retrieve_obj(self, _id):
except (IndexError, ValueError):
pass
- m = ICapAudio.get_object_method(_id)
+ m = CapAudio.get_object_method(_id)
if m:
obj = self.get_object(_id, m)
diff --git a/weboob/applications/suboob/suboob.py b/weboob/applications/suboob/suboob.py
index c2349f743ff02196bdeac6f068f71e938e1af861..401a155f607496fc9e005b8b70992969bddb3e58 100644
--- a/weboob/applications/suboob/suboob.py
+++ b/weboob/applications/suboob/suboob.py
@@ -21,7 +21,7 @@
import sys
-from weboob.capabilities.subtitle import ICapSubtitle
+from weboob.capabilities.subtitle import CapSubtitle
from weboob.capabilities.base import empty
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
@@ -92,7 +92,7 @@ class Suboob(ReplApplication):
DESCRIPTION = "Console application allowing to search for subtitles on various services " \
"and download them."
SHORT_DESCRIPTION = "search and download subtitles"
- CAPS = ICapSubtitle
+ CAPS = CapSubtitle
EXTRA_FORMATTERS = {'subtitle_list': SubtitleListFormatter,
'subtitle_info': SubtitleInfoFormatter
}
diff --git a/weboob/applications/translaboob/translaboob.py b/weboob/applications/translaboob/translaboob.py
index 2d2643da3db9586cfaf8c8fc0e47f97526b84d91..84969e2f80d0be4b3514cf788244c4891a9a97da 100644
--- a/weboob/applications/translaboob/translaboob.py
+++ b/weboob/applications/translaboob/translaboob.py
@@ -19,7 +19,7 @@
import sys
-from weboob.capabilities.translate import ICapTranslate, TranslationFail, LanguageNotSupported
+from weboob.capabilities.translate import CapTranslate, TranslationFail, LanguageNotSupported
from weboob.tools.application.repl import ReplApplication
from weboob.tools.application.formatters.iformatter import IFormatter
@@ -51,7 +51,7 @@ class Translaboob(ReplApplication):
COPYRIGHT = 'Copyright(C) 2012 Lucien Loiseau'
DESCRIPTION = "Console application to translate text from one language to another"
SHORT_DESCRIPTION = "translate text from one language to another"
- CAPS = ICapTranslate
+ CAPS = CapTranslate
EXTRA_FORMATTERS = {'translation': TranslationFormatter,
'xmltrans': XmlTranslationFormatter,
}
diff --git a/weboob/applications/traveloob/traveloob.py b/weboob/applications/traveloob/traveloob.py
index 1cbe14ef004f00f6aaa97c7c90b5f2c967b6b5ff..6b56acb5e3411070aeeea915ec197a3ac76de363 100644
--- a/weboob/applications/traveloob/traveloob.py
+++ b/weboob/applications/traveloob/traveloob.py
@@ -22,7 +22,7 @@
import datetime
from weboob.capabilities.base import Currency, empty
-from weboob.capabilities.travel import ICapTravel, RoadmapFilters
+from weboob.capabilities.travel import CapTravel, RoadmapFilters
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import PrettyFormatter
@@ -68,7 +68,7 @@ class Traveloob(ReplApplication):
COPYRIGHT = 'Copyright(C) 2010-2013 Romain Bignon'
DESCRIPTION = "Console application allowing to search for train stations and get departure times."
SHORT_DESCRIPTION = "search for train stations and departures"
- CAPS = ICapTravel
+ CAPS = CapTravel
DEFAULT_FORMATTER = 'table'
EXTRA_FORMATTERS = {'stations': StationsFormatter,
'departures': DeparturesFormatter,
diff --git a/weboob/applications/videoob/videoob.py b/weboob/applications/videoob/videoob.py
index c83462b5455c860f436744f02be08a765d0abc18..79e9eb7d6db279bf64e7d9a5b7817e60058034d2 100644
--- a/weboob/applications/videoob/videoob.py
+++ b/weboob/applications/videoob/videoob.py
@@ -23,7 +23,7 @@
import sys
import os
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
from weboob.capabilities.base import empty
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.media_player import InvalidMediaPlayer, MediaPlayer, MediaPlayerNotFound
@@ -58,7 +58,7 @@ class Videoob(ReplApplication):
DESCRIPTION = "Console application allowing to search for videos on various websites, " \
"play and download them and get information."
SHORT_DESCRIPTION = "search and play videos"
- CAPS = ICapVideo
+ CAPS = CapVideo
EXTRA_FORMATTERS = {'video_list': VideoListFormatter}
COMMANDS_FORMATTERS = {'search': 'video_list',
'ls': 'video_list',
diff --git a/weboob/applications/webcontentedit/webcontentedit.py b/weboob/applications/webcontentedit/webcontentedit.py
index c50582b131a8c70b16b411fb7b7bf36baed2263e..cb704a0e827f14acaf95b1179ec09c3095eb75bb 100644
--- a/weboob/applications/webcontentedit/webcontentedit.py
+++ b/weboob/applications/webcontentedit/webcontentedit.py
@@ -25,7 +25,7 @@
import codecs
from weboob.core.bcall import CallErrors
-from weboob.capabilities.content import ICapContent, Revision
+from weboob.capabilities.content import CapContent, Revision
from weboob.tools.application.repl import ReplApplication, defaultcount
@@ -38,7 +38,7 @@ class WebContentEdit(ReplApplication):
COPYRIGHT = 'Copyright(C) 2010-2011 Romain Bignon'
DESCRIPTION = "Console application allowing to display and edit contents on various websites."
SHORT_DESCRIPTION = "manage websites content"
- CAPS = ICapContent
+ CAPS = CapContent
def do_edit(self, line):
"""
diff --git a/weboob/applications/weboobcfg/weboobcfg.py b/weboob/applications/weboobcfg/weboobcfg.py
index 4ef6182cc4b781d4daa084878ea2b3116f416912..86394a19b85a613eadf5758fd763fff8c6eddde9 100644
--- a/weboob/applications/weboobcfg/weboobcfg.py
+++ b/weboob/applications/weboobcfg/weboobcfg.py
@@ -22,7 +22,7 @@
import sys
import re
-from weboob.capabilities.account import ICapAccount
+from weboob.capabilities.account import CapAccount
from weboob.core.modules import ModuleLoadError
from weboob.tools.application.repl import ReplApplication
from weboob.tools.ordereddict import OrderedDict
@@ -100,7 +100,7 @@ def do_confirm(self, backend_name):
print >>sys.stderr, 'Error: backend "%s" not found.' % backend_name
return 1
- if not backend.has_caps(ICapAccount):
+ if not backend.has_caps(CapAccount):
print >>sys.stderr, 'Error: backend "%s" does not support accounts management' % backend_name
return 1
diff --git a/weboob/applications/weboorrents/weboorrents.py b/weboob/applications/weboorrents/weboorrents.py
index 7c77bbd755f0138fa1d549bfcd7f87f6ddd7fbe5..9c8bff6689d3c49bfd720ea5e6858fff26dfd9cb 100644
--- a/weboob/applications/weboorrents/weboorrents.py
+++ b/weboob/applications/weboorrents/weboorrents.py
@@ -20,7 +20,7 @@
import sys
-from weboob.capabilities.torrent import ICapTorrent, MagnetOnly
+from weboob.capabilities.torrent import CapTorrent, MagnetOnly
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
from weboob.core import CallErrors
@@ -96,7 +96,7 @@ class Weboorrents(ReplApplication):
DESCRIPTION = "Console application allowing to search for torrents on various trackers " \
"and download .torrent files."
SHORT_DESCRIPTION = "search and download torrents"
- CAPS = ICapTorrent
+ CAPS = CapTorrent
EXTRA_FORMATTERS = {'torrent_list': TorrentListFormatter,
'torrent_info': TorrentInfoFormatter,
}
diff --git a/weboob/applications/wetboobs/wetboobs.py b/weboob/applications/wetboobs/wetboobs.py
index ae7b05c1f3e76a7496957d7beec7b1cae0fa1bc3..0b7dc0e0931e3651270022186a295c0ecfe469ad 100644
--- a/weboob/applications/wetboobs/wetboobs.py
+++ b/weboob/applications/wetboobs/wetboobs.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.weather import ICapWeather
+from weboob.capabilities.weather import CapWeather
from weboob.tools.application.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter
@@ -63,7 +63,7 @@ class WetBoobs(ReplApplication):
COPYRIGHT = 'Copyright(C) 2010-2014 Romain Bignon'
DESCRIPTION = "Console application allowing to display weather and forecasts in your city."
SHORT_DESCRIPTION = "display weather and forecasts"
- CAPS = ICapWeather
+ CAPS = CapWeather
DEFAULT_FORMATTER = 'table'
EXTRA_FORMATTERS = {'cities': CitiesFormatter,
'current': CurrentFormatter,
@@ -87,7 +87,7 @@ def do_cities(self, pattern):
"""
self.change_path(['cities'])
self.start_format()
- for backend, city in self.do('iter_city_search', pattern, caps=ICapWeather):
+ for backend, city in self.do('iter_city_search', pattern, caps=CapWeather):
self.cached_format(city)
def complete_current(self, text, line, *ignored):
@@ -111,7 +111,7 @@ def do_current(self, line):
self.formatter.temperature_display = lambda t: t.asfahrenheit()
self.start_format()
- for backend, current in self.do('get_current', _id, backends=backend_name, caps=ICapWeather):
+ for backend, current in self.do('get_current', _id, backends=backend_name, caps=CapWeather):
if current:
self.format(current)
@@ -136,5 +136,5 @@ def do_forecasts(self, line):
self.formatter.temperature_display = lambda t: t.asfahrenheit()
self.start_format()
- for backend, forecast in self.do('iter_forecast', _id, backends=backend_name, caps=ICapWeather):
+ for backend, forecast in self.do('iter_forecast', _id, backends=backend_name, caps=CapWeather):
self.format(forecast)
diff --git a/weboob/capabilities/account.py b/weboob/capabilities/account.py
index d1502dbdc1810008cda081adfb29e04d1aefe74e..e2762b157e8f6fd1ae4657ece1cac5a90bd0224d 100644
--- a/weboob/capabilities/account.py
+++ b/weboob/capabilities/account.py
@@ -21,7 +21,7 @@
from .base import IBaseCap, BaseObject, StringField, Field, UserError
-__all__ = ['AccountRegisterError', 'Account', 'StatusField', 'ICapAccount']
+__all__ = ['AccountRegisterError', 'Account', 'StatusField', 'CapAccount']
class AccountRegisterError(UserError):
@@ -56,7 +56,7 @@ def __init__(self, key, label, value, flags=0):
self.flags = flags
-class ICapAccount(IBaseCap):
+class CapAccount(IBaseCap):
"""
Capability for websites when you can create and manage accounts.
diff --git a/weboob/capabilities/audio.py b/weboob/capabilities/audio.py
index 3e3893a93d089a6b70eb5bf82a4b61f778ba69bb..2320e9f0ebad40567b9934e63debc6e707b1f323 100644
--- a/weboob/capabilities/audio.py
+++ b/weboob/capabilities/audio.py
@@ -23,10 +23,10 @@
from .image import BaseImage
from .base import Field, StringField, IntField, BaseObject
-from .file import ICapFile, BaseFile
+from .file import CapFile, BaseFile
-__all__ = ['BaseAudio', 'ICapAudio']
+__all__ = ['BaseAudio', 'CapAudio']
def decode_id(decode_id):
@@ -106,7 +106,7 @@ def decode_id(cls, _id):
return _id
-class ICapAudio(ICapFile):
+class CapAudio(CapFile):
"""
Audio file provider
"""
@@ -124,7 +124,7 @@ def get_object_method(cls, _id):
else:
return 'get_audio'
- def search_audio(self, pattern, sortby=ICapFile.SEARCH_RELEVANCE):
+ def search_audio(self, pattern, sortby=CapFile.SEARCH_RELEVANCE):
"""
search for a audio file
@@ -135,7 +135,7 @@ def search_audio(self, pattern, sortby=ICapFile.SEARCH_RELEVANCE):
"""
return self.search_file(pattern, sortby)
- def search_album(self, pattern, sortby=ICapFile.SEARCH_RELEVANCE):
+ def search_album(self, pattern, sortby=CapFile.SEARCH_RELEVANCE):
"""
search for an album
:param pattern: pattern to search on
@@ -144,7 +144,7 @@ def search_album(self, pattern, sortby=ICapFile.SEARCH_RELEVANCE):
"""
raise NotImplementedError()
- def search_playlist(self, pattern, sortby=ICapFile.SEARCH_RELEVANCE):
+ def search_playlist(self, pattern, sortby=CapFile.SEARCH_RELEVANCE):
"""
search for an album
:param pattern: pattern to search on
diff --git a/weboob/capabilities/audiostream.py b/weboob/capabilities/audiostream.py
index a36471ffcbe4843ad5869d4a16918d71efe63b3e..70939264cd5ea2da4b0a798fc220f602e1d16828 100644
--- a/weboob/capabilities/audiostream.py
+++ b/weboob/capabilities/audiostream.py
@@ -20,11 +20,11 @@
from weboob.tools.capabilities.streaminfo import StreamInfo
from .base import Field
-from .file import ICapFile
-from .audio import ICapAudio, BaseAudio
+from .file import CapFile
+from .audio import CapAudio, BaseAudio
-__all__ = ['BaseAudioStream', 'ICapAudioStream']
+__all__ = ['BaseAudioStream', 'CapAudioStream']
class BaseAudioStream(BaseAudio):
@@ -40,11 +40,11 @@ def __repr__(self):
return self.__unicode__()
-class ICapAudioStream(ICapAudio):
+class CapAudioStream(CapAudio):
"""
Audio streams provider
"""
- def search_audiostreams(self, pattern, sortby=ICapFile.SEARCH_RELEVANCE):
+ def search_audiostreams(self, pattern, sortby=CapFile.SEARCH_RELEVANCE):
"""
Search an audio stream
diff --git a/weboob/capabilities/bank.py b/weboob/capabilities/bank.py
index 5628f1ceaa8ceabcb1d69c4e87dcc7dcad8f35b2..d0c9840278c01d1be3e9a1b603f91dd744e3fad2 100644
--- a/weboob/capabilities/bank.py
+++ b/weboob/capabilities/bank.py
@@ -25,10 +25,10 @@
from weboob.tools.compat import basestring, long
from .base import BaseObject, Field, StringField, DateField, DecimalField, IntField, UserError, Currency
-from .collection import ICapCollection
+from .collection import CapCollection
-__all__ = ['AccountNotFound', 'TransferError', 'Recipient', 'Account', 'Transaction', 'Investment', 'Transfer', 'ICapBank']
+__all__ = ['AccountNotFound', 'TransferError', 'Recipient', 'Account', 'Transaction', 'Investment', 'Transfer', 'CapBank']
class AccountNotFound(UserError):
@@ -157,7 +157,7 @@ class Transfer(BaseObject):
reason = StringField('Reason')
-class ICapBank(ICapCollection):
+class CapBank(CapCollection):
"""
Capability of bank websites to see accounts and transactions.
"""
diff --git a/weboob/capabilities/bill.py b/weboob/capabilities/bill.py
index 5d46d3e364391624bb0d23c5de88a2b62383970b..b26584b18a70c81180c0cb670655f7df705a5fd9 100644
--- a/weboob/capabilities/bill.py
+++ b/weboob/capabilities/bill.py
@@ -19,10 +19,10 @@
from .base import BaseObject, StringField, DateField, DecimalField, UserError
-from .collection import ICapCollection
+from .collection import CapCollection
-__all__ = ['SubscriptionNotFound', 'BillNotFound', 'Detail', 'Bill', 'Subscription', 'ICapBill']
+__all__ = ['SubscriptionNotFound', 'BillNotFound', 'Detail', 'Bill', 'Subscription', 'CapBill']
class SubscriptionNotFound(UserError):
@@ -86,7 +86,7 @@ class Subscription(BaseObject):
renewdate = DateField('Reset date of consumption')
-class ICapBill(ICapCollection):
+class CapBill(CapCollection):
def iter_resources(self, objs, split_path):
"""
Iter resources. Will return :func:`iter_subscriptions`.
diff --git a/weboob/capabilities/bugtracker.py b/weboob/capabilities/bugtracker.py
index 66398cb0fd0decc4d50c7509d8080f7799d60c04..13541ce4d60096f6ac2e0be7647f882bedc7c0b1 100644
--- a/weboob/capabilities/bugtracker.py
+++ b/weboob/capabilities/bugtracker.py
@@ -23,7 +23,7 @@
__all__ = ['IssueError', 'Project', 'User', 'Version', 'Status', 'Attachment',
- 'Change', 'Update', 'Issue', 'Query', 'ICapBugTracker']
+ 'Change', 'Update', 'Issue', 'Query', 'CapBugTracker']
class IssueError(UserError):
@@ -231,7 +231,7 @@ def __init__(self):
BaseObject.__init__(self, '')
-class ICapBugTracker(IBaseCap):
+class CapBugTracker(IBaseCap):
"""
Bug trackers websites.
"""
diff --git a/weboob/capabilities/calendar.py b/weboob/capabilities/calendar.py
index 5c4e37dbc2a60aa3e6356bedb5b8fa7e153baf82..00ef783f65d50dad2afe699d82a63595f1e30f0a 100644
--- a/weboob/capabilities/calendar.py
+++ b/weboob/capabilities/calendar.py
@@ -18,12 +18,12 @@
# along with weboob. If not, see .
from .base import BaseObject, StringField, DateField, IntField, FloatField, Field
-from .collection import ICapCollection, CollectionNotFound, Collection
+from .collection import CapCollection, CollectionNotFound, Collection
from datetime import time, datetime
from weboob.tools.date import parse_date
-__all__ = ['BaseCalendarEvent', 'ICapCalendarEvent']
+__all__ = ['BaseCalendarEvent', 'CapCalendarEvent']
def enum(**enums):
@@ -102,7 +102,7 @@ def __init__(self):
self.categories.append(value)
-class ICapCalendarEvent(ICapCollection):
+class CapCalendarEvent(CapCollection):
"""
Capability of calendar event type sites
"""
diff --git a/weboob/capabilities/chat.py b/weboob/capabilities/chat.py
index 282965f56453b0594a05c814657953b7e0a57fe3..9d9f4b852ffe16318f532f1a3cb06cb57a9087ae 100644
--- a/weboob/capabilities/chat.py
+++ b/weboob/capabilities/chat.py
@@ -23,7 +23,7 @@
from .base import IBaseCap, BaseObject, StringField, DateField, UserError
-__all__ = ['ChatException', 'ChatMessage', 'ICapChat']
+__all__ = ['ChatException', 'ChatMessage', 'CapChat']
class ChatException(UserError):
@@ -52,7 +52,7 @@ def __init__(self, id_from, id_to, message, date=None):
self.date = datetime.datetime.utcnow()
-class ICapChat(IBaseCap):
+class CapChat(IBaseCap):
"""
Websites with a chat system.
"""
diff --git a/weboob/capabilities/cinema.py b/weboob/capabilities/cinema.py
index bb3709cc35c8244514c559eebcc84ec1fd25dbff..3e53d734518e0af543ab859df78b65832bb88c4f 100644
--- a/weboob/capabilities/cinema.py
+++ b/weboob/capabilities/cinema.py
@@ -21,7 +21,7 @@
from .base import IBaseCap, BaseObject, DateField, StringField, IntField, Field
-__all__ = ['Movie', 'Person', 'ICapCinema']
+__all__ = ['Movie', 'Person', 'CapCinema']
class Movie(BaseObject):
@@ -68,7 +68,7 @@ def __init__(self, id, name):
self.name = name
-class ICapCinema(IBaseCap):
+class CapCinema(IBaseCap):
"""
Cinema databases.
"""
diff --git a/weboob/capabilities/collection.py b/weboob/capabilities/collection.py
index b8d44a5ab69d39b5e7ec802a8af271bf0fbd94f1..0aa985292ebb74ece7730d900bf6517ca847b8b7 100644
--- a/weboob/capabilities/collection.py
+++ b/weboob/capabilities/collection.py
@@ -22,7 +22,7 @@
from .base import IBaseCap, BaseObject, UserError, StringField, Field
-__all__ = ['ICapCollection', 'BaseCollection', 'Collection', 'CollectionNotFound']
+__all__ = ['CapCollection', 'BaseCollection', 'Collection', 'CollectionNotFound']
class CollectionNotFound(UserError):
@@ -95,7 +95,7 @@ def __unicode__(self):
return u'Unknown collection'
-class ICapCollection(IBaseCap):
+class CapCollection(IBaseCap):
def iter_resources_flat(self, objs, split_path, clean_only=False):
"""
Call iter_resources() to fetch all resources in the tree.
diff --git a/weboob/capabilities/contact.py b/weboob/capabilities/contact.py
index 31f6fae00aa32bfb416eff67abddbcb90b7ae80c..f1f7c8a05b25c6a91d4a6b65163da9866a56f53a 100644
--- a/weboob/capabilities/contact.py
+++ b/weboob/capabilities/contact.py
@@ -23,7 +23,7 @@
from weboob.tools.ordereddict import OrderedDict
-__all__ = ['ProfileNode', 'ContactPhoto', 'Contact', 'QueryError', 'Query', 'ICapContact']
+__all__ = ['ProfileNode', 'ContactPhoto', 'Contact', 'QueryError', 'Query', 'CapContact']
class ProfileNode(object):
@@ -165,7 +165,7 @@ def __init__(self, id, message):
self.message = message
-class ICapContact(IBaseCap):
+class CapContact(IBaseCap):
def iter_contacts(self, status=Contact.STATUS_ALL, ids=None):
"""
Iter contacts
diff --git a/weboob/capabilities/content.py b/weboob/capabilities/content.py
index 559eb601803d61733614d0042b8a6fa102a04d6a..1ee0835353b2725cee1a4c3dce7914de3fb08f0d 100644
--- a/weboob/capabilities/content.py
+++ b/weboob/capabilities/content.py
@@ -21,7 +21,7 @@
from .base import IBaseCap, BaseObject, StringField, DateField, Field
-__all__ = ['Content', 'Revision', 'ICapContent']
+__all__ = ['Content', 'Revision', 'CapContent']
class Content(BaseObject):
@@ -44,7 +44,7 @@ class Revision(BaseObject):
minor = Field('Is this change minor?', bool)
-class ICapContent(IBaseCap):
+class CapContent(IBaseCap):
def get_content(self, id, revision=None):
"""
Get a content from an ID.
diff --git a/weboob/capabilities/dating.py b/weboob/capabilities/dating.py
index 7ebf8f4d1fd79300a0850fd4fa23e0dd0698e88b..9baa3ba6200253cbec9ee58d28f3c15edabc2cc5 100644
--- a/weboob/capabilities/dating.py
+++ b/weboob/capabilities/dating.py
@@ -22,7 +22,7 @@
from .contact import Contact
-__all__ = ['OptimizationNotFound', 'Optimization', 'Event', 'ICapDating']
+__all__ = ['OptimizationNotFound', 'Optimization', 'Event', 'CapDating']
class OptimizationNotFound(UserError):
@@ -89,7 +89,7 @@ class Event(BaseObject):
message = StringField('Message of the event')
-class ICapDating(IBaseCap):
+class CapDating(IBaseCap):
"""
Capability for dating websites.
"""
diff --git a/weboob/capabilities/file.py b/weboob/capabilities/file.py
index a63271ca5efb0ffc893fabd2e54f5e899d52cca2..b6f29d46337d9af347a12383d6be8b5b225bc384 100644
--- a/weboob/capabilities/file.py
+++ b/weboob/capabilities/file.py
@@ -21,7 +21,7 @@
from .base import IBaseCap, BaseObject, NotAvailable, Field, StringField, DateField
-__all__ = ['BaseFile', 'ICapFile']
+__all__ = ['BaseFile', 'CapFile']
class BaseFile(BaseObject):
@@ -59,7 +59,7 @@ def page_url(self):
return self.id2url(self.id)
-class ICapFile(IBaseCap):
+class CapFile(IBaseCap):
"""
Provide file download
"""
diff --git a/weboob/capabilities/gallery.py b/weboob/capabilities/gallery.py
index 93a867873e5d91b531b89c6979c2dc3af7d7c7d3..898075c2270117358cba1fac3155b2d0a65d6fe4 100644
--- a/weboob/capabilities/gallery.py
+++ b/weboob/capabilities/gallery.py
@@ -22,7 +22,7 @@
from .base import IBaseCap, BaseObject, NotLoaded, Field, StringField, \
BytesField, IntField, FloatField, DateField
-__all__ = ['BaseGallery', 'BaseImage', 'ICapGallery']
+__all__ = ['BaseGallery', 'BaseImage', 'CapGallery']
class BaseGallery(BaseObject):
@@ -102,7 +102,7 @@ def __iscomplete__(self):
return self.data is not NotLoaded
-class ICapGallery(IBaseCap):
+class CapGallery(IBaseCap):
"""
This capability represents the ability for a website backend to provide videos.
"""
diff --git a/weboob/capabilities/gauge.py b/weboob/capabilities/gauge.py
index 92b7b68f94031a734673a751c2404f45a3f8782b..064783861f5900376d909b73e5c8b35796047785 100644
--- a/weboob/capabilities/gauge.py
+++ b/weboob/capabilities/gauge.py
@@ -20,7 +20,7 @@
from .base import IBaseCap, BaseObject, StringField, FloatField, DateField, Field, UserError, empty
-__all__ = ['Gauge', 'GaugeSensor', 'GaugeMeasure', 'ICapGauge', 'SensorNotFound']
+__all__ = ['Gauge', 'GaugeSensor', 'GaugeMeasure', 'CapGauge', 'SensorNotFound']
class SensorNotFound(UserError):
@@ -73,7 +73,7 @@ def __repr__(self):
return "" % (self.id, self.name)
-class ICapGauge(IBaseCap):
+class CapGauge(IBaseCap):
def iter_gauges(self, pattern=None):
"""
Iter gauges.
diff --git a/weboob/capabilities/geolocip.py b/weboob/capabilities/geolocip.py
index 56b46b00c1b46039f129ae5c71eb6ae2ab3b6cac..2512c7f5f9dc75aaae5d844e43b9599061a7dd94 100644
--- a/weboob/capabilities/geolocip.py
+++ b/weboob/capabilities/geolocip.py
@@ -21,7 +21,7 @@
from .base import IBaseCap, BaseObject, StringField, FloatField
-__all__ = ['IpLocation', 'ICapGeolocIp']
+__all__ = ['IpLocation', 'CapGeolocIp']
class IpLocation(BaseObject):
@@ -42,7 +42,7 @@ def __init__(self, ipaddr):
BaseObject.__init__(self, ipaddr)
-class ICapGeolocIp(IBaseCap):
+class CapGeolocIp(IBaseCap):
"""
Access information about IP addresses database.
"""
diff --git a/weboob/capabilities/housing.py b/weboob/capabilities/housing.py
index 5a45e6f1891c9e957a0595fbd271cb6d744142e8..1224fe23fb9df914b86757d24104aff868c17056 100644
--- a/weboob/capabilities/housing.py
+++ b/weboob/capabilities/housing.py
@@ -22,7 +22,7 @@
StringField, BytesField, DateField
-__all__ = ['HousingPhoto', 'Housing', 'Query', 'City', 'ICapHousing']
+__all__ = ['HousingPhoto', 'Housing', 'Query', 'City', 'CapHousing']
class HousingPhoto(BaseObject):
@@ -89,7 +89,7 @@ class City(BaseObject):
name = StringField('Name of city')
-class ICapHousing(IBaseCap):
+class CapHousing(IBaseCap):
"""
Capability of websites to search housings.
"""
diff --git a/weboob/capabilities/image.py b/weboob/capabilities/image.py
index f772f9aaa8d9de2aa6563c1b208ff6615b401107..cc19dfe14ce3b49693e20be219db782fa733aa98 100644
--- a/weboob/capabilities/image.py
+++ b/weboob/capabilities/image.py
@@ -20,9 +20,9 @@
from weboob.tools.ordereddict import OrderedDict
from .base import NotLoaded, Field, BytesField
-from .file import ICapFile, BaseFile
+from .file import CapFile, BaseFile
-__all__ = ['BaseImage', 'ICapImage']
+__all__ = ['BaseImage', 'CapImage']
class _BaseImage(BaseFile):
"""
@@ -57,11 +57,11 @@ def iter_decorate(d):
return OrderedDict(iter_decorate(fields_iterator))
-class ICapImage(ICapFile):
+class CapImage(CapFile):
"""
Image file provider
"""
- def search_image(self, pattern, sortby=ICapFile.SEARCH_RELEVANCE, nsfw=False):
+ def search_image(self, pattern, sortby=CapFile.SEARCH_RELEVANCE, nsfw=False):
"""
search for an image file
diff --git a/weboob/capabilities/job.py b/weboob/capabilities/job.py
index 65ac71eb9c9193bfa5dba2815075e7a7da8abd61..d6d370ca2dad670e1d0801f16c5fb1224126f870 100644
--- a/weboob/capabilities/job.py
+++ b/weboob/capabilities/job.py
@@ -19,7 +19,7 @@
from .base import BaseObject, IBaseCap, StringField, DateField
-__all__ = ['BaseJobAdvert', 'ICapJob']
+__all__ = ['BaseJobAdvert', 'CapJob']
class BaseJobAdvert(BaseObject):
@@ -67,7 +67,7 @@ def page_url(self):
return self.id2url(self.id)
-class ICapJob(IBaseCap):
+class CapJob(IBaseCap):
"""
Capability of job annouce websites.
"""
diff --git a/weboob/capabilities/library.py b/weboob/capabilities/library.py
index 526004942931313a0bf36bd19f1bd6eb99b391a2..428e5dc5340330c12e6da2cc45f63233ba0c7377 100644
--- a/weboob/capabilities/library.py
+++ b/weboob/capabilities/library.py
@@ -17,11 +17,11 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from .collection import ICapCollection
+from .collection import CapCollection
from .base import BaseObject, Field, StringField, DateField
-__all__ = ['Book', 'Renew', 'ICapBook']
+__all__ = ['Book', 'Renew', 'CapBook']
class Book(BaseObject):
@@ -42,7 +42,7 @@ class Renew(BaseObject):
message = StringField('Message')
-class ICapBook(ICapCollection):
+class CapBook(CapCollection):
"""
Library websites.
"""
diff --git a/weboob/capabilities/lyrics.py b/weboob/capabilities/lyrics.py
index 5194472c5c9360bf8e768308a95c459c4ada3b35..98a79090bc39a072e83cef86038a9bee8fef1707 100644
--- a/weboob/capabilities/lyrics.py
+++ b/weboob/capabilities/lyrics.py
@@ -21,7 +21,7 @@
from .base import IBaseCap, BaseObject, StringField
-__all__ = ['SongLyrics', 'ICapLyrics']
+__all__ = ['SongLyrics', 'CapLyrics']
class SongLyrics(BaseObject):
@@ -37,7 +37,7 @@ def __init__(self, id, title):
self.title = title
-class ICapLyrics(IBaseCap):
+class CapLyrics(IBaseCap):
"""
Lyrics websites.
"""
diff --git a/weboob/capabilities/messages.py b/weboob/capabilities/messages.py
index 4ce4b70ae31ff512dfa81a10bbb5b55a22bbc610..bec6b9cb0cc3c23f781dab29b55bab0d66e5945f 100644
--- a/weboob/capabilities/messages.py
+++ b/weboob/capabilities/messages.py
@@ -25,7 +25,7 @@
DateField, IntField, UserError
-__all__ = ['Thread', 'Message', 'ICapMessages', 'CantSendMessage', 'ICapMessagesPost']
+__all__ = ['Thread', 'Message', 'CapMessages', 'CantSendMessage', 'CapMessagesPost']
# Message and Thread's attributes refer to themselves, and it isn't possible
@@ -165,7 +165,7 @@ def _iter_all_messages(self, message):
yield m
-class ICapMessages(IBaseCap):
+class CapMessages(IBaseCap):
"""
Capability to read messages.
"""
@@ -209,7 +209,7 @@ class CantSendMessage(UserError):
"""
-class ICapMessagesPost(IBaseCap):
+class CapMessagesPost(IBaseCap):
"""
This capability allow user to send a message.
"""
diff --git a/weboob/capabilities/parcel.py b/weboob/capabilities/parcel.py
index d4ebf3982f65850f1539784113c3897de3b3bca1..eb53db09a31f3acec99cef232b87c2f1d9c8d527 100644
--- a/weboob/capabilities/parcel.py
+++ b/weboob/capabilities/parcel.py
@@ -41,7 +41,7 @@ class Parcel(BaseObject):
history = Field('History', list)
-class ICapParcel(IBaseCap):
+class CapParcel(IBaseCap):
def get_parcel_tracking(self, id):
"""
Get information abouut a parcel.
diff --git a/weboob/capabilities/paste.py b/weboob/capabilities/paste.py
index 6889f045f1a476909f83bdbda344c470fa2aeeb3..99567e4c29caf534bfdc358ea018d1d2b6307f49 100644
--- a/weboob/capabilities/paste.py
+++ b/weboob/capabilities/paste.py
@@ -21,7 +21,7 @@
from .base import IBaseCap, BaseObject, NotLoaded, Field, StringField, UserError
-__all__ = ['PasteNotFound', 'BasePaste', 'ICapPaste']
+__all__ = ['PasteNotFound', 'BasePaste', 'CapPaste']
class PasteNotFound(UserError):
@@ -63,7 +63,7 @@ def page_url(self):
return self.id2url(self.id)
-class ICapPaste(IBaseCap):
+class CapPaste(IBaseCap):
"""
This capability represents the ability for a website backend to store plain text.
"""
diff --git a/weboob/capabilities/pricecomparison.py b/weboob/capabilities/pricecomparison.py
index 8c086a9848db89e79e5fa6e74d9bd12cd561a4b8..84e25363ef6c21c89c57fc9cd6c902cabab8a76f 100644
--- a/weboob/capabilities/pricecomparison.py
+++ b/weboob/capabilities/pricecomparison.py
@@ -22,7 +22,7 @@
StringField, DateField
-__all__ = ['Shop', 'Price', 'Product', 'ICapPriceComparison']
+__all__ = ['Shop', 'Price', 'Product', 'CapPriceComparison']
class Product(BaseObject):
@@ -53,7 +53,7 @@ class Price(BaseObject):
product = Field('Product', Product)
-class ICapPriceComparison(IBaseCap):
+class CapPriceComparison(IBaseCap):
"""
Capability for price comparison websites.
"""
diff --git a/weboob/capabilities/radio.py b/weboob/capabilities/radio.py
index cd82675fa2f51b3be24d1faae665c0326f0ec417..0a1fbdce675d489b6c686d337dc906af8bd13cfa 100644
--- a/weboob/capabilities/radio.py
+++ b/weboob/capabilities/radio.py
@@ -23,7 +23,7 @@
from weboob.tools.capabilities.streaminfo import StreamInfo
-__all__ = ['Radio', 'ICapRadio']
+__all__ = ['Radio', 'CapRadio']
class Radio(BaseObject):
@@ -35,7 +35,7 @@ class Radio(BaseObject):
current = Field('Current emission', StreamInfo)
streams = Field('List of streams', list)
-class ICapRadio(IBaseCap):
+class CapRadio(IBaseCap):
"""
Capability of radio websites.
"""
diff --git a/weboob/capabilities/recipe.py b/weboob/capabilities/recipe.py
index 715bbcf36c63afcad0a15590bfa607eef4c3f3d2..a619b454017b83d883e371348483d579d8eb013c 100644
--- a/weboob/capabilities/recipe.py
+++ b/weboob/capabilities/recipe.py
@@ -27,7 +27,7 @@
import urllib
-__all__ = ['Recipe', 'ICapRecipe']
+__all__ = ['Recipe', 'CapRecipe']
class Comment():
@@ -161,7 +161,7 @@ def toKrecipesXml(self, author=None):
return header + ET.tostring(doc, encoding='UTF-8', pretty_print=True).decode('utf-8')
-class ICapRecipe(IBaseCap):
+class CapRecipe(IBaseCap):
"""
Recipe providers.
"""
diff --git a/weboob/capabilities/subtitle.py b/weboob/capabilities/subtitle.py
index 6f8e677420ad6ce703df4dd86103b14d22743261..56ae1042b4e9d479c4b4e696c71e05b1795eed81 100644
--- a/weboob/capabilities/subtitle.py
+++ b/weboob/capabilities/subtitle.py
@@ -21,7 +21,7 @@
from .base import IBaseCap, BaseObject, StringField, IntField, UserError
-__all__ = ['Subtitle', 'ICapSubtitle']
+__all__ = ['Subtitle', 'CapSubtitle']
class LanguageNotSupported(UserError):
@@ -48,7 +48,7 @@ def __init__(self, id, name):
BaseObject.__init__(self, id)
self.name = name
-class ICapSubtitle(IBaseCap):
+class CapSubtitle(IBaseCap):
"""
Subtitle providers.
"""
diff --git a/weboob/capabilities/torrent.py b/weboob/capabilities/torrent.py
index 4afed6f7fe0ec0ee8e59efaab37032df6ae37836..056a9b05c3925aed2d16c07e68dd83fc73cdaf2c 100644
--- a/weboob/capabilities/torrent.py
+++ b/weboob/capabilities/torrent.py
@@ -22,7 +22,7 @@
DateField, IntField, UserError
-__all__ = ['MagnetOnly', 'Torrent', 'ICapTorrent']
+__all__ = ['MagnetOnly', 'Torrent', 'CapTorrent']
class MagnetOnly(UserError):
@@ -54,7 +54,7 @@ def __init__(self, id, name):
self.name = name
-class ICapTorrent(IBaseCap):
+class CapTorrent(IBaseCap):
"""
Torrent trackers.
"""
diff --git a/weboob/capabilities/translate.py b/weboob/capabilities/translate.py
index 7ac01f2bad00d477269581f31adc036f14155d07..30557ff0134b665a73641997c2096db3dd745d30 100644
--- a/weboob/capabilities/translate.py
+++ b/weboob/capabilities/translate.py
@@ -21,7 +21,7 @@
from .base import IBaseCap, BaseObject, StringField, UserError
-__all__ = ['TranslationFail', 'LanguageNotSupported', 'ICapTranslate']
+__all__ = ['TranslationFail', 'LanguageNotSupported', 'CapTranslate']
class LanguageNotSupported(UserError):
@@ -51,7 +51,7 @@ class Translation(BaseObject):
text = StringField('Translation')
-class ICapTranslate(IBaseCap):
+class CapTranslate(IBaseCap):
"""
Capability of online translation website to translate word or sentence
"""
diff --git a/weboob/capabilities/travel.py b/weboob/capabilities/travel.py
index bd6860f4f77026aabe03efafea7b132c05189c7b..9a6258f21b30029b21c64b67e6c96b41fe83ceca 100644
--- a/weboob/capabilities/travel.py
+++ b/weboob/capabilities/travel.py
@@ -24,7 +24,7 @@
DateField, DecimalField, UserError
-__all__ = ['Station', 'Departure', 'RoadStep', 'RoadmapError', 'RoadmapFilters', 'ICapTravel']
+__all__ = ['Station', 'Departure', 'RoadStep', 'RoadmapError', 'RoadmapFilters', 'CapTravel']
class Station(BaseObject):
@@ -96,7 +96,7 @@ def __init__(self):
BaseObject.__init__(self, '')
-class ICapTravel(IBaseCap):
+class CapTravel(IBaseCap):
"""
Travel websites.
"""
diff --git a/weboob/capabilities/video.py b/weboob/capabilities/video.py
index 7b28089780178517eaae049495d734e7b44e0bb1..eb3394a9184490ab6babebf7dcd6ba54e7608994 100644
--- a/weboob/capabilities/video.py
+++ b/weboob/capabilities/video.py
@@ -21,10 +21,10 @@
from datetime import timedelta
from .base import Field
-from .image import ICapImage, BaseImage
+from .image import CapImage, BaseImage
-__all__ = ['BaseVideo', 'ICapVideo']
+__all__ = ['BaseVideo', 'CapVideo']
class BaseVideo(BaseImage):
@@ -36,12 +36,12 @@ class BaseVideo(BaseImage):
duration = Field('file duration', int, long, timedelta)
-class ICapVideo(ICapImage):
+class CapVideo(CapImage):
"""
Video file provider.
"""
- def search_videos(self, pattern, sortby=ICapImage.SEARCH_RELEVANCE, nsfw=False):
+ def search_videos(self, pattern, sortby=CapImage.SEARCH_RELEVANCE, nsfw=False):
"""
search for a video file
diff --git a/weboob/capabilities/weather.py b/weboob/capabilities/weather.py
index cb51f802c00199aff2707a07abad82d7e5e0e531..c19cd74d042a3a90d220db30914c9328f0714e45 100644
--- a/weboob/capabilities/weather.py
+++ b/weboob/capabilities/weather.py
@@ -24,7 +24,7 @@
StringField, UserError
-__all__ = ['Forecast', 'Current', 'City', 'CityNotFound', 'Temperature', 'ICapWeather']
+__all__ = ['Forecast', 'Current', 'City', 'CityNotFound', 'Temperature', 'CapWeather']
class Temperature(BaseObject):
@@ -109,7 +109,7 @@ class CityNotFound(UserError):
"""
-class ICapWeather(IBaseCap):
+class CapWeather(IBaseCap):
"""
Capability for weather websites.
"""
diff --git a/weboob/core/ouiboube.py b/weboob/core/ouiboube.py
index ff8ef56255066d3b47921610c4d8689e8c7f74c8..28c3e4370548a866c6022ccee058cf94dc27f072 100644
--- a/weboob/core/ouiboube.py
+++ b/weboob/core/ouiboube.py
@@ -392,7 +392,7 @@ def load_backends(self, caps=None, names=None, modules=None, exclude=None, stora
Load backends listed in config file.
:param caps: load backends which implement all of specified caps
- :type caps: tuple[:class:`weboob.capabilities.base.ICapBase`]
+ :type caps: tuple[:class:`weboob.capabilities.base.CapBase`]
:param names: load backends with instance name in list
:type names: tuple[:class:`str`]
:param modules: load backends which module is in list
diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py
index f009323367c73a98857e1ed4c1dfc6e6471212cd..ef91abc4e64162dc59573fea170dd9c75c091b1f 100644
--- a/weboob/tools/application/console.py
+++ b/weboob/tools/application/console.py
@@ -31,7 +31,7 @@
from ssl import SSLError
from weboob.capabilities import UserError
-from weboob.capabilities.account import ICapAccount, Account, AccountRegisterError
+from weboob.capabilities.account import CapAccount, Account, AccountRegisterError
from weboob.core.backendscfg import BackendAlreadyExists
from weboob.core.modules import ModuleLoadError
from weboob.core.repositories import ModuleInstallError
@@ -238,7 +238,7 @@ def register_backend(self, name, ask_add=True):
print('Backend "%s" does not exist.' % name, file=sys.stderr)
return 1
- if not backend.has_caps(ICapAccount) or backend.klass.ACCOUNT_REGISTER_PROPERTIES is None:
+ if not backend.has_caps(CapAccount) or backend.klass.ACCOUNT_REGISTER_PROPERTIES is None:
print('You can\'t register a new account with %s' % name, file=sys.stderr)
return 1
diff --git a/weboob/tools/application/qt/backendcfg.py b/weboob/tools/application/qt/backendcfg.py
index 7feebd2606d80d1fe06dd9ee13fa3bba6e6c6fc3..74e113afba8875144b6e0f00ab4728f26dcd915c 100644
--- a/weboob/tools/application/qt/backendcfg.py
+++ b/weboob/tools/application/qt/backendcfg.py
@@ -32,7 +32,7 @@
from weboob.core.modules import ModuleLoadError
from weboob.core.repositories import IProgress, ModuleInstallError
from weboob.core.backendscfg import BackendAlreadyExists
-from weboob.capabilities.account import ICapAccount, Account, AccountRegisterError
+from weboob.capabilities.account import CapAccount, Account, AccountRegisterError
from weboob.tools.application.qt.backendcfg_ui import Ui_BackendCfg
from weboob.tools.application.qt.reposdlg_ui import Ui_RepositoriesDlg
from weboob.tools.ordereddict import OrderedDict
@@ -378,9 +378,9 @@ def moduleSelectionChanged(self):
module.license,
(unicode(self.tr('Website: %s
')) % module.website) if module.website else '',
module.description,
- ', '.join(sorted(cap.__name__.replace('ICap', '') for cap in module.iter_caps()))))
+ ', '.join(sorted(cap.__name__.replace('Cap', '') for cap in module.iter_caps()))))
- if module.has_caps(ICapAccount) and self.ui.nameEdit.isEnabled() and \
+ if module.has_caps(CapAccount) and self.ui.nameEdit.isEnabled() and \
module.klass.ACCOUNT_REGISTER_PROPERTIES is not None:
self.ui.registerButton.show()
else:
diff --git a/weboob/tools/application/repl.py b/weboob/tools/application/repl.py
index ad3531963ac333a55fd3ff7568cdf848be958881..9f4cac0b215ef3ab9323ae1a3f6ab10667afd24b 100644
--- a/weboob/tools/application/repl.py
+++ b/weboob/tools/application/repl.py
@@ -34,7 +34,7 @@
from weboob.tools.misc import to_unicode
from weboob.tools.path import WorkingPath
from weboob.tools.ordereddict import OrderedDict
-from weboob.capabilities.collection import Collection, BaseCollection, ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import Collection, BaseCollection, CapCollection, CollectionNotFound
from .console import BackendNotGiven, ConsoleApplication
from .formatters.load import FormattersLoader, FormatterLoadError
@@ -1102,7 +1102,7 @@ def do_cd(self, line):
try:
for backend, res in self.do('get_collection', objs=self.COLLECTION_OBJECTS,
split_path=self.working_path.get(),
- caps=ICapCollection):
+ caps=CapCollection):
if res:
collections.append(res)
except CallErrors as errors:
@@ -1125,7 +1125,7 @@ def _fetch_objects(self, objs):
try:
for backend, res in self.do('iter_resources', objs=objs,
split_path=split_path,
- caps=ICapCollection):
+ caps=CapCollection):
yield res
except CallErrors as errors:
self.bcall_errors_handler(errors, CollectionNotFound)
diff --git a/weboob/tools/capabilities/gallery/genericcomicreader.py b/weboob/tools/capabilities/gallery/genericcomicreader.py
index db685edd404cd4a7ca2cf332761c1554d5cddc58..ab38d13806373b97fb06e22d5adddcdc50e12299 100644
--- a/weboob/tools/capabilities/gallery/genericcomicreader.py
+++ b/weboob/tools/capabilities/gallery/genericcomicreader.py
@@ -21,7 +21,7 @@
import re
-from weboob.capabilities.gallery import ICapGallery, BaseGallery, BaseImage
+from weboob.capabilities.gallery import CapGallery, BaseGallery, BaseImage
from weboob.tools.backend import BaseBackend
from weboob.tools.browser import BaseBrowser, BasePage
@@ -63,7 +63,7 @@ def fill_image(self, image, fields):
image.data = self.readurl(image.url)
-class GenericComicReaderBackend(BaseBackend, ICapGallery):
+class GenericComicReaderBackend(BaseBackend, 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 32a7c1709d44ef11a907a2e27361c2cbcff93046..d77ee60c11c53bba253cffa84aaabed23262189a 100644
--- a/weboob/tools/capabilities/messages/GenericBackend.py
+++ b/weboob/tools/capabilities/messages/GenericBackend.py
@@ -19,13 +19,13 @@
import time
-from weboob.capabilities.messages import ICapMessages, Message, Thread
+from weboob.capabilities.messages import CapMessages, Message, Thread
from weboob.capabilities.base import find_object
from weboob.tools.backend import BaseBackend
from weboob.tools.newsfeed import Newsfeed
-class GenericNewspaperBackend(BaseBackend, ICapMessages):
+class GenericNewspaperBackend(BaseBackend, CapMessages):
"""
GenericNewspaperBackend class
"""
diff --git a/weboob/tools/capabilities/paste.py b/weboob/tools/capabilities/paste.py
index da6254da24e17fb8f163057788180a9a5405ba80..ae2e934c6b4649a9ab4fa8c587394dbd4226de1f 100644
--- a/weboob/tools/capabilities/paste.py
+++ b/weboob/tools/capabilities/paste.py
@@ -20,11 +20,11 @@
-from weboob.capabilities.paste import ICapPaste
+from weboob.capabilities.paste import CapPaste
import binascii
-class BasePasteBackend(ICapPaste):
+class BasePasteBackend(CapPaste):
EXPIRATIONS = {}
"""
List of expirations and their corresponding remote codes (any type can be used).