rename ICap to Cap (closes #1424)

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 <http://www.gnu.org/licenses/>.
 
-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'

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'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from urllib import quote_plus
 __all__ = ['AllocineBackend']
 
 
-class AllocineBackend(BaseBackend, ICapCinema):
+class AllocineBackend(BaseBackend, CapCinema):
     NAME = 'allocine'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

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 @@ from .browser import AlloRestoBrowser
 __all__ = ['AlloRestoBackend']
 
 
-class AlloRestoBackend(BaseBackend, ICapBank):
+class AlloRestoBackend(BaseBackend, CapBank):
     NAME = 'alloresto'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from urllib import quote_plus
 __all__ = ['AllrecipesBackend']
 
 
-class AllrecipesBackend(BaseBackend, ICapRecipe):
+class AllrecipesBackend(BaseBackend, CapRecipe):
     NAME = 'allrecipes'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

modules/ameli/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 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 @@ from .browser import AmeliBrowser
 __all__ = ['AmeliBackend']
 
 
-class AmeliBackend(BaseBackend, ICapBill):
+class AmeliBackend(BaseBackend, CapBill):
     NAME = 'ameli'
     DESCRIPTION = u'Ameli website: French Health Insurance'
     MAINTAINER = u'Christophe Lampin'

modules/amelipro/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 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 @@ from .browser import AmeliProBrowser
 __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'

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 @@ from .browser import AmericanExpressBrowser
 __all__ = ['AmericanExpressBackend']
 
 
-class AmericanExpressBackend(BaseBackend, ICapBank):
+class AmericanExpressBackend(BaseBackend, CapBank):
     NAME = 'americanexpress'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 @@ from .job import ApecJobAdvert
 __all__ = ['ApecBackend']
 
 
-class ApecBackend(BaseBackend, ICapJob):
+class ApecBackend(BaseBackend, CapJob):
     NAME = 'apec'
     DESCRIPTION = u'apec website'
     MAINTAINER = u'Bezleputh'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import ApivieBrowser
 __all__ = ['ApivieBackend']
 
 
-class ApivieBackend(BaseBackend, ICapBank):
+class ApivieBackend(BaseBackend, CapBank):
     NAME = 'apivie'
     DESCRIPTION = u'Apivie'
     MAINTAINER = u'Romain Bignon'

modules/arretsurimages/backend.py

@@ -18,8 +18,8 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
 from weboob.tools.backend import BaseBackend, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 
@@ -29,7 +29,7 @@ from .video import ArretSurImagesVideo
 __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')

modules/arte/backend.py

@@ -20,8 +20,8 @@
 
 import re
 
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound, Collection
+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 @@ from .video import ArteVideo, ArteLiveVideo
 __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 @@ class ArteBackend(BaseBackend, ICapVideo, ICapCollection):
             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)
 

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from urllib import quote_plus
 __all__ = ['AttilasubBackend']
 
 
-class AttilasubBackend(BaseBackend, ICapSubtitle):
+class AttilasubBackend(BaseBackend, CapSubtitle):
     NAME = 'attilasub'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

modules/audioaddict/backend.py

@@ -18,10 +18,10 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ __all__ = ['AudioAddictBackend']
 # 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'

modules/aum/backend.py

@@ -28,11 +28,11 @@ from dateutil import tz
 from dateutil.parser import parse as _parse_dt
 
 from weboob.capabilities.base import NotLoaded
-from weboob.capabilities.chat import ICapChat
+from weboob.capabilities.chat import CapChat
-from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Message, Thread
+from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message, Thread
-from weboob.capabilities.dating import ICapDating, OptimizationNotFound, Event
+from weboob.capabilities.dating import CapDating, OptimizationNotFound, Event
-from weboob.capabilities.contact import ICapContact, ContactPhoto, Query, QueryError
+from weboob.capabilities.contact import CapContact, ContactPhoto, Query, QueryError
-from weboob.capabilities.account import ICapAccount, StatusField
+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 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
             # 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 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
                 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 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
         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 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
         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 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
     #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='^[^ ]+@[^ ]+\.[^ ]+$'),

modules/axabanque/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import AXABanque
 __all__ = ['AXABanqueBackend']
 
 
-class AXABanqueBackend(BaseBackend, ICapBank):
+class AXABanqueBackend(BaseBackend, CapBank):
     NAME = 'axabanque'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 @@ from .browser import BanqueAccordBrowser
 __all__ = ['BanqueAccordBackend']
 
 
-class BanqueAccordBackend(BaseBackend, ICapBank):
+class BanqueAccordBackend(BaseBackend, CapBank):
     NAME = 'banqueaccord'
     DESCRIPTION = u'Banque Accord'
     MAINTAINER = u'Romain Bignon'

modules/banquepopulaire/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import BanquePopulaire
 __all__ = ['BanquePopulaireBackend']
 
 
-class BanquePopulaireBackend(BaseBackend, ICapBank):
+class BanquePopulaireBackend(BaseBackend, CapBank):
     NAME = 'banquepopulaire'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/barclays/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import Barclays
 __all__ = ['BarclaysBackend']
 
 
-class BarclaysBackend(BaseBackend, ICapBank):
+class BarclaysBackend(BaseBackend, CapBank):
     NAME = 'barclays'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 @@ from.calendar import BiplanCalendarEvent
 __all__ = ['BiplanBackend']
 
 
-class BiplanBackend(BaseBackend, ICapCalendarEvent):
+class BiplanBackend(BaseBackend, CapCalendarEvent):
     NAME = 'biplan'
     DESCRIPTION = u'lebiplan.org website'
     MAINTAINER = u'Bezleputh'

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.bank import CapBank, AccountNotFound, Account, Recipient
-from weboob.capabilities.messages import ICapMessages, Thread
+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 @@ from .enterprise.browser import BNPEnterprise
 __all__ = ['BNPorcBackend']
 
 
-class BNPorcBackend(BaseBackend, ICapBank, ICapMessages):
+class BNPorcBackend(BaseBackend, CapBank, CapMessages):
     NAME = 'bnporc'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/boursorama/backend.py

@@ -20,7 +20,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import Boursorama
 __all__ = ['BoursoramaBackend']
 
 
-class BoursoramaBackend(BaseBackend, ICapBank):
+class BoursoramaBackend(BaseBackend, CapBank):
     NAME = 'boursorama'
     MAINTAINER = u'Gabriel Kerneis'
     EMAIL = 'gabriel@kerneis.info'

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 @@ from .browser import BouyguesBrowser
 __all__ = ['BouyguesBackend']
 
 
-class BouyguesBackend(BaseBackend, ICapMessages, ICapMessagesPost):
+class BouyguesBackend(BaseBackend, CapMessages, CapMessagesPost):
     NAME = 'bouygues'
     MAINTAINER = u'Christophe Benz'
     EMAIL = 'christophe.benz@gmail.com'

modules/bp/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import BPBrowser
 __all__ = ['BPBackend']
 
 
-class BPBackend(BaseBackend, ICapBank):
+class BPBackend(BaseBackend, CapBank):
     NAME = 'bp'
     MAINTAINER = u'Nicolas Duhamel'
     EMAIL = 'nicolas@jombi.fr'

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 @@ from .browser import BredBrowser
 __all__ = ['BredBackend']
 
 
-class BredBackend(BaseBackend, ICapBank):
+class BredBackend(BaseBackend, CapBank):
     NAME = 'bred'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 @@ from .browser import BTDiggBrowser
 
 __all__ = ['BTDiggBackend']
 
-class BTDiggBackend(BaseBackend, ICapTorrent):
+class BTDiggBackend(BaseBackend, CapTorrent):
     NAME = 'btdigg'
     MAINTAINER = u'Matthieu Rakotojaona'
     EMAIL = 'matthieu.rakotojaona@gmail.com'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from urllib import quote_plus
 __all__ = ['BtmonBackend']
 
 
-class BtmonBackend(BaseBackend, ICapTorrent):
+class BtmonBackend(BaseBackend, CapTorrent):
     NAME = 'btmon'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

modules/caissedepargne/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import CaisseEpargne
 __all__ = ['CaisseEpargneBackend']
 
 
-class CaisseEpargneBackend(BaseBackend, ICapBank):
+class CaisseEpargneBackend(BaseBackend, CapBank):
     NAME = 'caissedepargne'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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)
 

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import CanalTP
 __all__ = ['CanalTPBackend']
 
 
-class CanalTPBackend(BaseBackend, ICapTravel):
+class CanalTPBackend(BaseBackend, CapTravel):
     NAME = 'canaltp'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/cappedtv/backend.py

@@ -10,8 +10,8 @@
 
 
 
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
 from weboob.tools.backend import BaseBackend
 from .browser import CappedBrowser, CappedVideo
 
@@ -19,7 +19,7 @@ from .browser import CappedBrowser, CappedVideo
 __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 @@ class CappedBackend(BaseBackend, ICapVideo, ICapCollection):
         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)
 

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 @@ from .browser import CarrefourBanque
 __all__ = ['CarrefourBanqueBackend']
 
 
-class CarrefourBanqueBackend(BaseBackend, ICapBank):
+class CarrefourBanqueBackend(BaseBackend, CapBank):
     NAME = 'carrefourbanque'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 @@ from .browser import CciBrowser
 __all__ = ['CciBackend']
 
 
-class CciBackend(BaseBackend, ICapJob):
+class CciBackend(BaseBackend, CapJob):
     NAME = 'cci'
     DESCRIPTION = u'cci website'
     MAINTAINER = u'Bezleputh'

modules/champslibres/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import ChampslibresBrowser
 __all__ = ['ChampslibresBackend']
 
 
-class ChampslibresBackend(BaseBackend, ICapBook):
+class ChampslibresBackend(BaseBackend, CapBook):
     NAME = 'champslibres'
     MAINTAINER = u'Florent Fourcot'
     EMAIL = 'weboob@flo.fourcot.fr'

modules/chronopost/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import ChronopostBrowser
 __all__ = ['ChronopostBackend']
 
 
-class ChronopostBackend(BaseBackend, ICapParcel):
+class ChronopostBackend(BaseBackend, CapParcel):
     NAME = 'chronopost'
     DESCRIPTION = u'Chronopost website'
     MAINTAINER = u'Romain Bignon'

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 @@ from .browser import CICBrowser
 __all__ = ['CICBackend']
 
 
-class CICBackend(BaseBackend, ICapBank):
+class CICBackend(BaseBackend, CapBank):
     NAME = 'cic'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 @@ from .browser import CitelisBrowser
 __all__ = ['CitelisBackend']
 
 
-class CitelisBackend(BaseBackend, ICapBank):
+class CitelisBackend(BaseBackend, CapBank):
     NAME = 'citelis'
     DESCRIPTION = u'Citélis'
     MAINTAINER = u'Laurent Bachelier'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from StringIO import StringIO
 __all__ = ['CmbBackend']
 
 
-class CmbBackend(BaseBackend, ICapBank):
+class CmbBackend(BaseBackend, CapBank):
     NAME = 'cmb'
     MAINTAINER = u'Johann Broudin'
     EMAIL = 'Johann.Broudin@6-8.fr'

modules/cmso/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import Cmso
 __all__ = ['CmsoBackend']
 
 
-class CmsoBackend(BaseBackend, ICapBank):
+class CmsoBackend(BaseBackend, CapBank):
     NAME = 'cmso'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import ColispriveBrowser
 __all__ = ['ColispriveBackend']
 
 
-class ColispriveBackend(BaseBackend, ICapParcel):
+class ColispriveBackend(BaseBackend, CapParcel):
     NAME = 'colisprive'
     DESCRIPTION = u'Colisprive parcel tracking website'
     MAINTAINER = u'Florent Fourcot'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from datetime import date
 __all__ = ['ColissimoBackend']
 
 
-class ColissimoBackend(BaseBackend, ICapParcel):
+class ColissimoBackend(BaseBackend, CapParcel):
     NAME = 'colissimo'
     DESCRIPTION = u'Colissimo parcel tracking website'
     MAINTAINER = u'Florent Fourcot'

modules/cragr/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .mobile.browser import CragrMobile
 __all__ = ['CragrBackend']
 
 
-class CragrBackend(BaseBackend, ICapBank):
+class CragrBackend(BaseBackend, CapBank):
     NAME = 'cragr'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/creditcooperatif/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .pro.browser import CreditCooperatif as CreditCooperatifPro
 __all__ = ['CreditCooperatifBackend']
 
 
-class CreditCooperatifBackend(BaseBackend, ICapBank):
+class CreditCooperatifBackend(BaseBackend, CapBank):
     NAME = 'creditcooperatif'
     MAINTAINER = u'Kevin Pouget'
     EMAIL = 'weboob@kevin.pouget.me'

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 @@ from .browser import CreditDuNordBrowser
 __all__ = ['CreditDuNordBackend']
 
 
-class CreditDuNordBackend(BaseBackend, ICapBank):
+class CreditDuNordBackend(BaseBackend, CapBank):
     NAME = 'creditdunord'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 @@ from .browser import CreditMutuelBrowser
 __all__ = ['CreditMutuelBackend']
 
 
-class CreditMutuelBackend(BaseBackend, ICapBank):
+class CreditMutuelBackend(BaseBackend, CapBank):
     NAME = 'creditmutuel'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

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 <http://www.gnu.org/licenses/>.
 
-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'

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 <http://www.gnu.org/licenses/>.
 
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
 from weboob.tools.backend import BaseBackend
 
 from .browser import DailymotionBrowser
@@ -28,7 +28,7 @@ from .video import DailymotionVideo
 __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 @@ class DailymotionBackend(BaseBackend, ICapVideo, ICapCollection):
 
     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])
 

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import DelubacBrowser
 __all__ = ['DelubacBackend']
 
 
-class DelubacBackend(BaseBackend, ICapBank):
+class DelubacBackend(BaseBackend, CapBank):
     NAME = 'delubac'
     DESCRIPTION = u'Banque Delubac & Cie'
     MAINTAINER = u'Noe Rubinstein'

modules/dlfp/backend.py

@@ -27,8 +27,8 @@ from weboob.tools.backend import BaseBackend, BackendConfig
 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.messages import CapMessages, CapMessagesPost, Message, Thread, CantSendMessage
-from weboob.capabilities.content import ICapContent, Content
+from weboob.capabilities.content import CapContent, Content
 
 from .browser import DLFP
 from .tools import rssid, id2url
@@ -37,7 +37,7 @@ from .tools import rssid, id2url
 __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 @@ class DLFPBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapContent):
         with self.browser:
             self.browser.close_session()
 
-    #### ICapMessages ##############################################
+    #### CapMessages ##############################################
 
     def iter_threads(self):
         whats = set()
@@ -221,7 +221,7 @@ class DLFPBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapContent):
     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 @@ class DLFPBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapContent):
                                              message.title,
                                              message.content)
 
-    #### ICapContent ###############################################
+    #### CapContent ###############################################
     def get_content(self, _id, revision=None):
         if isinstance(_id, basestring):
             content = Content(_id)

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 @@ from weboob.tools.backend import BaseBackend
 __all__ = ['DresdenWetterBackend']
 
 
-class DresdenWetterBackend(BaseBackend, ICapGauge):
+class DresdenWetterBackend(BaseBackend, CapGauge):
     NAME = 'dresdenwetter'
     MAINTAINER = u'Florent Fourcot'
     EMAIL = 'weboob@flo.fourcot.fr'

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 @@ from weboob.tools.browser import StandardBrowser
 __all__ = ['EbonicsBackend']
 
 
-class EbonicsBackend(BaseBackend, ICapTranslate):
+class EbonicsBackend(BaseBackend, CapTranslate):
     NAME = 'ebonics'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import EdfBrowser
 __all__ = ['EdfBackend']
 
 
-class EdfBackend(BaseBackend, ICapBill):
+class EdfBackend(BaseBackend, CapBill):
     NAME = 'edf'
     DESCRIPTION = u'Edf website: French power provider'
     MAINTAINER = u'Christophe Gouiran'

modules/ehentai/backend.py

@@ -20,8 +20,8 @@
 
 
 import re
-from weboob.capabilities.gallery import ICapGallery, BaseGallery
+from weboob.capabilities.gallery import CapGallery, BaseGallery
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+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 @@ from .gallery import EHentaiGallery, EHentaiImage
 __all__ = ['EHentaiBackend']
 
 
-class EHentaiBackend(BaseBackend, ICapGallery, ICapCollection):
+class EHentaiBackend(BaseBackend, CapGallery, CapCollection):
     NAME = 'ehentai'
     MAINTAINER = u'Roger Philibert'
     EMAIL = 'roger.philibert@gmail.com'

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 @@ from .video import EuroparlVideo
 __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 @@ class EuroparlBackend(BaseBackend, ICapVideo, ICapCollection):
 
     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])
 

modules/feedly/backend.py

@@ -19,8 +19,8 @@
 
 
 from weboob.tools.backend import BaseBackend, BackendConfig
-from weboob.capabilities.collection import ICapCollection
+from weboob.capabilities.collection import CapCollection
-from weboob.capabilities.messages import ICapMessages, Message, Thread
+from weboob.capabilities.messages import CapMessages, Message, Thread
 from weboob.tools.value import Value, ValueBackendPassword
 
 from .browser import FeedlyBrowser
@@ -29,7 +29,7 @@ from .google import GoogleBrowser
 __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'

modules/fortuneo/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import Fortuneo
 __all__ = ['FortuneoBackend']
 
 
-class FortuneoBackend(BaseBackend, ICapBank):
+class FortuneoBackend(BaseBackend, CapBank):
     NAME = 'fortuneo'
     MAINTAINER = u'Gilles-Alexandre Quenot'
     EMAIL = 'gilles.quenot@gmail.com'

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 @@ from .browser import FourChan
 __all__ = ['FourChanBackend']
 
 
-class FourChanBackend(BaseBackend, ICapMessages):
+class FourChanBackend(BaseBackend, CapMessages):
     NAME = 'fourchan'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/francetelevisions/backend.py

@@ -18,8 +18,8 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
 from weboob.tools.backend import BaseBackend
 
 from .browser import PluzzBrowser
@@ -28,7 +28,7 @@ from .browser import PluzzBrowser
 __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):

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import Freemobile
 __all__ = ['FreeMobileBackend']
 
 
-class FreeMobileBackend(BaseBackend, ICapBill):
+class FreeMobileBackend(BaseBackend, CapBill):
     NAME = 'freemobile'
     MAINTAINER = u'Florent Fourcot'
     EMAIL = 'weboob@flo.fourcot.fr'

modules/ganassurances/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import GanAssurances
 __all__ = ['GanAssurancesBackend']
 
 
-class GanAssurancesBackend(BaseBackend, ICapBank):
+class GanAssurancesBackend(BaseBackend, CapBank):
     NAME = 'ganassurances'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import GazelleBrowser
 __all__ = ['GazelleBackend']
 
 
-class GazelleBackend(BaseBackend, ICapTorrent):
+class GazelleBackend(BaseBackend, CapTorrent):
     NAME = 'gazelle'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 @@ from .video import GDCVaultVideo
 __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 @@ class GDCVaultBackend(BaseBackend, ICapVideo, ICapCollection):
 
     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])
 

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import GdfSuez
 __all__ = ['GdfSuezBackend']
 
 
-class GdfSuezBackend(BaseBackend, ICapBill):
+class GdfSuezBackend(BaseBackend, CapBill):
     NAME = 'gdfsuez'
     MAINTAINER = u'Mathieu Jourdan'
     EMAIL = 'mathieu.jourdan@gresille.org'

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 @@ from weboob.tools.browser import BaseBrowser, BrowserUnavailable
 __all__ = ['GeolocIpBackend']
 
 
-class GeolocIpBackend(BaseBackend, ICapGeolocIp):
+class GeolocIpBackend(BaseBackend, CapGeolocIp):
     NAME = 'geolocip'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

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 @@ STATUSES = {'open': Status('open', u'Open', Status.VALUE_NEW),
             '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'

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 @@ from .browser import GoogleTranslateBrowser
 __all__ = ['GoogleTranslateBackend']
 
 
-class GoogleTranslateBackend(BaseBackend, ICapTranslate):
+class GoogleTranslateBackend(BaseBackend, CapTranslate):
     MAINTAINER = u'Lucien Loiseau'
     EMAIL = 'loiseau.lucien@gmail.com'
     VERSION = '0.j'

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.audio import CapAudio, BaseAudio, Album, Playlist, decode_id
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+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 @@ class GroovesharkBackend(BaseBackend, ICapAudio, ICapCollection):
             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 @@ class GroovesharkBackend(BaseBackend, ICapAudio, ICapCollection):
         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 @@ class GroovesharkBackend(BaseBackend, ICapAudio, ICapCollection):
         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():

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import GroupamaesBrowser
 __all__ = ['GroupamaesBackend']
 
 
-class GroupamaesBackend(BaseBackend, ICapBank):
+class GroupamaesBackend(BaseBackend, CapBank):
     NAME = 'groupamaes'
     DESCRIPTION = u"Groupama Épargne Salariale"
     MAINTAINER = u'Bezleputh'

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 @@ from .browser import GuerrillamailBrowser
 __all__ = ['GuerrillamailBackend']
 
 
-class GuerrillamailBackend(BaseBackend, ICapMessages, ICapMessagesPost):
+class GuerrillamailBackend(BaseBackend, CapMessages, CapMessagesPost):
     NAME = 'guerrillamail'
     DESCRIPTION = u'GuerrillaMail temp mailbox'
     MAINTAINER = u'Vincent A'

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 @@ from .browser import HDSBrowser
 __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:

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.bank import CapBank, AccountNotFound, Account, Recipient
-from weboob.capabilities.messages import ICapMessages, Thread
+from weboob.capabilities.messages import CapMessages, Thread
 from weboob.tools.backend import BaseBackend, BackendConfig
 from weboob.tools.value import ValueBackendPassword
 
@@ -33,7 +33,7 @@ from .browser import HelloBank
 __all__ = ['HelloBankBackend']
 
 
-class HelloBankBackend(BaseBackend, ICapBank, ICapMessages):
+class HelloBankBackend(BaseBackend, CapBank, CapMessages):
     NAME = 'hellobank'
     MAINTAINER = u'Christophe Lampin'
     EMAIL = 'weboob@lampin.net'

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 @@ from .browser import HSBC
 __all__ = ['HSBCBackend']
 
 
-class HSBCBackend(BaseBackend, ICapBank):
+class HSBCBackend(BaseBackend, CapBank):
     NAME = 'hsbc'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

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 @@ from .calendar import HybrideCalendarEvent
 __all__ = ['HybrideBackend']
 
 
-class HybrideBackend(BaseBackend, ICapCalendarEvent):
+class HybrideBackend(BaseBackend, CapCalendarEvent):
     NAME = 'hybride'
     DESCRIPTION = u'hybride website'
     MAINTAINER = u'Bezleputh'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from urllib import quote_plus
 __all__ = ['ImdbBackend']
 
 
-class ImdbBackend(BaseBackend, ICapCinema):
+class ImdbBackend(BaseBackend, CapCinema):
     NAME = 'imdb'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

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 @@ class ImgPaste(BasePaste):
         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'

modules/ina/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .video import InaVideo
 __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)
 

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'

modules/ing/backend.py

@@ -18,9 +18,9 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import IngBrowser
 __all__ = ['INGBackend']
 
 
-class INGBackend(BaseBackend, ICapBank, ICapBill):
+class INGBackend(BaseBackend, CapBank, CapBill):
     NAME = 'ing'
     MAINTAINER = u'Florent Fourcot'
     EMAIL = 'weboob@flo.fourcot.fr'

modules/inrocks/backend.py

@@ -18,13 +18,13 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 "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'

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 @@ from weboob.tools.browser import StandardBrowser
 __all__ = ['IpinfodbBackend']
 
 
-class IpinfodbBackend(BaseBackend, ICapGeolocIp):
+class IpinfodbBackend(BaseBackend, CapGeolocIp):
     NAME = 'ipinfodb'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

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 @@ class IzneoBrowser(BaseBrowser):
                 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'

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 <http://www.gnu.org/licenses/>.
 
-from weboob.capabilities.video import ICapVideo, BaseVideo
+from weboob.capabilities.video import CapVideo, BaseVideo
-from weboob.capabilities.collection import ICapCollection, CollectionNotFound
+from weboob.capabilities.collection import CapCollection, CollectionNotFound
 from weboob.tools.backend import BaseBackend
 
 from .browser import JacquieEtMichelBrowser
@@ -28,7 +28,7 @@ from .video import JacquieEtMichelVideo
 __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 @@ class JacquieEtMichelBackend(BaseBackend, ICapVideo, ICapCollection):
             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([])
 

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))

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from .browser import JVMalin
 __all__ = ['JVMalinBackend']
 
 
-class JVMalinBackend(BaseBackend, ICapTravel):
+class JVMalinBackend(BaseBackend, CapTravel):
     NAME = 'jvmalin'
     MAINTAINER = u'Alexandre Lissy'
     EMAIL = 'github@lissy.me'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from gzip import GzipFile
 __all__ = ['KickassBackend']
 
 
-class KickassBackend(BaseBackend, ICapTorrent):
+class KickassBackend(BaseBackend, CapTorrent):
     NAME = 'kickass'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

modules/lacentrale/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 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 @@ __all__ = ['LaCentraleBackend']
 
 
 # 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 @@ class LaCentraleBackend(BaseBackend, ICapPriceComparison):
             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:

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 @@ from .enterprise.browser import LCLEnterpriseBrowser
 __all__ = ['LCLBackend']
 
 
-class LCLBackend(BaseBackend, ICapBank):
+class LCLBackend(BaseBackend, CapBank):
     NAME = 'lcl'
     MAINTAINER = u'Romain Bignon'
     EMAIL = 'romain@weboob.org'

modules/leclercmobile/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import Leclercmobile
 __all__ = ['LeclercMobileBackend']
 
 
-class LeclercMobileBackend(BaseBackend, ICapBill):
+class LeclercMobileBackend(BaseBackend, CapBill):
     NAME = 'leclercmobile'
     MAINTAINER = u'Florent Fourcot'
     EMAIL = 'weboob@flo.fourcot.fr'

modules/lefigaro/backend.py

@@ -18,13 +18,13 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 "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'

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 .browser import NewspaperLibeBrowser
 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'

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 @@ from .job import LolixJobAdvert
 __all__ = ['LolixBackend']
 
 
-class LolixBackend(BaseBackend, ICapJob):
+class LolixBackend(BaseBackend, CapJob):
     NAME = 'lolix'
     DESCRIPTION = u'Lolix French free software employment website'
     MAINTAINER = u'Bezleputh'

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 @@ from .browser import LutimBrowser
 __all__ = ['LutimBackend']
 
 
-class LutimBackend(BaseBackend, ICapPaste):
+class LutimBackend(BaseBackend, CapPaste):
     NAME = 'lutim'
     DESCRIPTION = u'LUTIm website'
     MAINTAINER = u'Vincent A'

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 @@ __all__ = ['MailinatorBackend']
 
 # 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'

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 <http://www.gnu.org/licenses/>.
 
-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 @@ from urllib import quote_plus
 __all__ = ['MarmitonBackend']
 
 
-class MarmitonBackend(BaseBackend, ICapRecipe):
+class MarmitonBackend(BaseBackend, CapRecipe):
     NAME = 'marmiton'
     MAINTAINER = u'Julien Veyssier'
     EMAIL = 'julien.veyssier@aiur.fr'

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 @@ from .browser import MediawikiBrowser
 __all__ = ['MediawikiBackend']
 
 
-class MediawikiBackend(BaseBackend, ICapContent):
+class MediawikiBackend(BaseBackend, CapContent):
     NAME = 'mediawiki'
     MAINTAINER = u'Clément Schreiner'
     EMAIL = 'clemux@clemux.info'

modules/meteofrance/backend.py

@@ -18,7 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-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 @@ from .browser import MeteofranceBrowser
 __all__ = ['MeteofranceBackend']
 
 
-class MeteofranceBackend(BaseBackend, ICapWeather):
+class MeteofranceBackend(BaseBackend, CapWeather):
     NAME = 'meteofrance'
     MAINTAINER = u'Cedric Defortis'
     EMAIL = 'cedric@aiur.fr'

modules/minutes20/backend.py

@@ -18,13 +18,13 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 "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'

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 @@ from .job import MonsterJobAdvert
 __all__ = ['MonsterBackend']
 
 
-class MonsterBackend(BaseBackend, ICapJob):
+class MonsterBackend(BaseBackend, CapJob):
     NAME = 'monster'
     DESCRIPTION = u'monster website'
     MAINTAINER = u'Bezleputh'

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 <http://www.gnu.org/licenses/>.
 
-from weboob.capabilities.radio import ICapRadio, Radio
+from weboob.capabilities.radio import CapRadio, Radio
-from weboob.capabilities.collection import ICapCollection
+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'

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 @@ from .browser import Nettokom
 __all__ = ['NettoKomBackend']
 
 
-class NettoKomBackend(BaseBackend, ICapBill):
+class NettoKomBackend(BaseBackend, CapBill):
     NAME = 'nettokom'
     MAINTAINER = u'Florent Fourcot'
     EMAIL = 'weboob@flo.fourcot.fr'