From c4a87b34cbaa3d74610b5d92b6f445e09a24f903 Mon Sep 17 00:00:00 2001 From: Sylvie Ye Date: Wed, 13 Dec 2017 18:36:30 +0100 Subject: [PATCH] add CapBankWealth and CapBankPockets in bank.py update CapBank into CapbankWealth when iter_investments is implemented update CapBank into CapbankPockets when iter_pockets is implemented add CapBankWealth when iter_investments is implemented and inherit CapCgp or CapBankTransfer or CapBankTransferAddRecipient add CapBankPockets when iter_pockets is implemented and inherit CapCgp or CapBankTransfer or CapBankTransferAddRecipient --- modules/afer/module.py | 4 ++-- modules/amundi/module.py | 4 ++-- modules/apivie/module.py | 4 ++-- modules/axabanque/module.py | 4 ++-- modules/banquepopulaire/module.py | 4 ++-- modules/barclays/module.py | 4 ++-- modules/bforbank/module.py | 4 ++-- modules/bnporc/module.py | 4 ++-- modules/boursorama/module.py | 4 ++-- modules/bp/module.py | 4 ++-- modules/caels/module.py | 4 ++-- modules/caissedepargne/module.py | 4 ++-- modules/carrefourbanque/module.py | 4 ++-- modules/cices/module.py | 4 ++-- modules/cmes/module.py | 4 ++-- modules/cmso/module.py | 4 ++-- modules/cragr/module.py | 4 ++-- modules/creditdunord/module.py | 4 ++-- modules/creditdunordpee/module.py | 4 ++-- modules/creditmutuel/module.py | 4 ++-- modules/fortuneo/module.py | 4 ++-- modules/groupama/module.py | 4 ++-- modules/groupamaes/module.py | 4 ++-- modules/hsbc/module.py | 4 ++-- modules/ing/module.py | 4 ++-- modules/lcl/module.py | 4 ++-- modules/pradoepargne/module.py | 4 ++-- modules/s2e/module.py | 4 ++-- modules/societegenerale/module.py | 4 ++-- modules/spirica/module.py | 4 ++-- modules/yomoni/module.py | 4 ++-- weboob/capabilities/bank.py | 24 ++++++++++++++++++------ 32 files changed, 80 insertions(+), 68 deletions(-) diff --git a/modules/afer/module.py b/modules/afer/module.py index 34063b36e7..0bbe9c2550 100644 --- a/modules/afer/module.py +++ b/modules/afer/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.base import find_object -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword @@ -29,7 +29,7 @@ __all__ = ['AferModule'] -class AferModule(Module, CapBank): +class AferModule(Module, CapBankWealth): NAME = 'afer' DESCRIPTION = u'afer website' MAINTAINER = u'James GALT' diff --git a/modules/amundi/module.py b/modules/amundi/module.py index 2ca6d706b7..769705eb91 100644 --- a/modules/amundi/module.py +++ b/modules/amundi/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value @@ -28,7 +28,7 @@ __all__ = ['AmundiModule'] -class AmundiModule(Module, CapBank): +class AmundiModule(Module, CapBankWealth): NAME = 'amundi' DESCRIPTION = u'amundi website' MAINTAINER = u'James GALT' diff --git a/modules/apivie/module.py b/modules/apivie/module.py index 34be7c67c6..5e68c90864 100644 --- a/modules/apivie/module.py +++ b/modules/apivie/module.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 CapBank +from weboob.capabilities.bank import CapBankWealth from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword @@ -27,7 +27,7 @@ __all__ = ['ApivieModule'] -class ApivieModule(Module, CapBank): +class ApivieModule(Module, CapBankWealth): NAME = 'apivie' DESCRIPTION = u'Apivie' MAINTAINER = u'Romain Bignon' diff --git a/modules/axabanque/module.py b/modules/axabanque/module.py index b8ae7a9a9b..6f757ecd81 100644 --- a/modules/axabanque/module.py +++ b/modules/axabanque/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object, NotAvailable from weboob.capabilities.bank import Account from weboob.capabilities.bill import CapDocument, Subscription, Document, DocumentNotFound, SubscriptionNotFound @@ -31,7 +31,7 @@ __all__ = ['AXABanqueModule'] -class AXABanqueModule(Module, CapBank, CapDocument): +class AXABanqueModule(Module, CapBankWealth, CapDocument): NAME = 'axabanque' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/banquepopulaire/module.py b/modules/banquepopulaire/module.py index 24d8f60888..56f6e32d9c 100644 --- a/modules/banquepopulaire/module.py +++ b/modules/banquepopulaire/module.py @@ -20,7 +20,7 @@ from collections import OrderedDict from functools import reduce -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.contact import CapContact from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value @@ -31,7 +31,7 @@ __all__ = ['BanquePopulaireModule'] -class BanquePopulaireModule(Module, CapBank, CapContact): +class BanquePopulaireModule(Module, CapBankWealth, CapContact): NAME = 'banquepopulaire' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/barclays/module.py b/modules/barclays/module.py index 2c11684dfe..cadd3c144f 100644 --- a/modules/barclays/module.py +++ b/modules/barclays/module.py @@ -20,7 +20,7 @@ from __future__ import unicode_literals -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from weboob.capabilities.base import find_object @@ -31,7 +31,7 @@ __all__ = ['BarclaysModule'] -class BarclaysModule(Module, CapBank): +class BarclaysModule(Module, CapBankWealth): NAME = 'barclays' MAINTAINER = u'Jean Walrave' EMAIL = 'jwalrave@budget-insight.com' diff --git a/modules/bforbank/module.py b/modules/bforbank/module.py index b36d36eca6..f2202fe6de 100644 --- a/modules/bforbank/module.py +++ b/modules/bforbank/module.py @@ -19,7 +19,7 @@ from weboob.tools.backend import Module, BackendConfig -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object from weboob.tools.value import ValueBackendPassword, ValueDate from .browser import BforbankBrowser @@ -28,7 +28,7 @@ __all__ = ['BforbankModule'] -class BforbankModule(Module, CapBank): +class BforbankModule(Module, CapBankWealth): NAME = 'bforbank' DESCRIPTION = u'BforBank' MAINTAINER = u'Baptiste Delpey' diff --git a/modules/bnporc/module.py b/modules/bnporc/module.py index d2c2925281..bec02fe1a2 100644 --- a/modules/bnporc/module.py +++ b/modules/bnporc/module.py @@ -23,7 +23,7 @@ from datetime import datetime, timedelta from weboob.capabilities.bank import ( - CapBankTransferAddRecipient, AccountNotFound, Account, TransferError, RecipientNotFound, + CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, Account, TransferError, RecipientNotFound, TransferInvalidLabel, ) from weboob.capabilities.messages import CapMessages, Thread @@ -41,7 +41,7 @@ __all__ = ['BNPorcModule'] -class BNPorcModule(Module, CapBankTransferAddRecipient, CapMessages, CapContact, CapProfile): +class BNPorcModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapMessages, CapContact, CapProfile): NAME = 'bnporc' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/boursorama/module.py b/modules/boursorama/module.py index 397089cf50..0306bf0cc1 100644 --- a/modules/boursorama/module.py +++ b/modules/boursorama/module.py @@ -20,7 +20,7 @@ # along with weboob. If not, see . -from weboob.capabilities.bank import CapBankTransferAddRecipient, Account, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, Account, AccountNotFound from weboob.capabilities.profile import CapProfile from weboob.capabilities.contact import CapContact from weboob.tools.backend import Module, BackendConfig @@ -32,7 +32,7 @@ __all__ = ['BoursoramaModule'] -class BoursoramaModule(Module, CapBankTransferAddRecipient, CapProfile, CapContact): +class BoursoramaModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapProfile, CapContact): NAME = 'boursorama' MAINTAINER = u'Gabriel Kerneis' EMAIL = 'gabriel@kerneis.info' diff --git a/modules/bp/module.py b/modules/bp/module.py index 414d16a745..1cafb4808c 100644 --- a/modules/bp/module.py +++ b/modules/bp/module.py @@ -19,7 +19,7 @@ from decimal import Decimal -from weboob.capabilities.bank import CapBankTransferAddRecipient, Account, AccountNotFound, RecipientNotFound, TransferError +from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, Account, AccountNotFound, RecipientNotFound, TransferError from weboob.capabilities.contact import CapContact from weboob.capabilities.base import find_object from weboob.tools.backend import Module, BackendConfig @@ -31,7 +31,7 @@ __all__ = ['BPModule'] -class BPModule(Module, CapBankTransferAddRecipient, CapContact): +class BPModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact): NAME = 'bp' MAINTAINER = u'Nicolas Duhamel' EMAIL = 'nicolas@jombi.fr' diff --git a/modules/caels/module.py b/modules/caels/module.py index 536e12062e..dec3ed91ce 100644 --- a/modules/caels/module.py +++ b/modules/caels/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword @@ -29,7 +29,7 @@ __all__ = ['CaelsModule'] -class CaelsModule(Module, CapBank): +class CaelsModule(Module, CapBankWealth): NAME = 'caels' DESCRIPTION = u'Crédit Agricole - Epargne Longue des Salariés' MAINTAINER = u'Edouard Lambert' diff --git a/modules/caissedepargne/module.py b/modules/caissedepargne/module.py index 7123ed6efa..4f13c8e720 100644 --- a/modules/caissedepargne/module.py +++ b/modules/caissedepargne/module.py @@ -21,7 +21,7 @@ from functools import wraps import re -from weboob.capabilities.bank import CapBankTransferAddRecipient, AccountNotFound, Account, RecipientNotFound +from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, Account, RecipientNotFound from weboob.capabilities.contact import CapContact from weboob.capabilities.profile import CapProfile from weboob.capabilities.base import find_object @@ -66,7 +66,7 @@ def wrapper(self, *args, **kwargs): return wrapper -class CaisseEpargneModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile): +class CaisseEpargneModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile): NAME = 'caissedepargne' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/carrefourbanque/module.py b/modules/carrefourbanque/module.py index 8040593f40..238cef6e7a 100644 --- a/modules/carrefourbanque/module.py +++ b/modules/carrefourbanque/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.base import find_object -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword @@ -29,7 +29,7 @@ __all__ = ['CarrefourBanqueModule'] -class CarrefourBanqueModule(Module, CapBank): +class CarrefourBanqueModule(Module, CapBankWealth): NAME = 'carrefourbanque' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/cices/module.py b/modules/cices/module.py index 39933a0061..951f60dbc5 100644 --- a/modules/cices/module.py +++ b/modules/cices/module.py @@ -20,7 +20,7 @@ from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object from .browser import CmesBrowser @@ -29,7 +29,7 @@ __all__ = ['CicesModule'] -class CicesModule(Module, CapBank): +class CicesModule(Module, CapBankWealth): NAME = 'cices' DESCRIPTION = u'CIC Épargne Salariale' MAINTAINER = u'Edouard Lambert' diff --git a/modules/cmes/module.py b/modules/cmes/module.py index 3b4190a1ee..0a4df636fc 100644 --- a/modules/cmes/module.py +++ b/modules/cmes/module.py @@ -20,7 +20,7 @@ from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object from .browser import CmesBrowser @@ -29,7 +29,7 @@ __all__ = ['CmesModule'] -class CmesModule(Module, CapBank): +class CmesModule(Module, CapBankWealth): NAME = 'cmes' DESCRIPTION = u'Crédit Mutuel Épargne Salariale' MAINTAINER = u'Edouard Lambert' diff --git a/modules/cmso/module.py b/modules/cmso/module.py index db8d0251d8..adaeb156ed 100644 --- a/modules/cmso/module.py +++ b/modules/cmso/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.contact import CapContact from weboob.capabilities.base import find_object from weboob.tools.backend import Module, BackendConfig @@ -31,7 +31,7 @@ __all__ = ['CmsoModule'] -class CmsoModule(Module, CapBank, CapContact): +class CmsoModule(Module, CapBankWealth, CapContact): NAME = 'cmso' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/cragr/module.py b/modules/cragr/module.py index 609117e6b5..42efc6f04b 100644 --- a/modules/cragr/module.py +++ b/modules/cragr/module.py @@ -22,7 +22,7 @@ import re from weboob.capabilities.base import find_object -from weboob.capabilities.bank import Account, AccountNotFound, CapBankTransferAddRecipient +from weboob.capabilities.bank import Account, AccountNotFound, CapBankWealth, CapBankTransferAddRecipient from weboob.capabilities.contact import CapContact from weboob.capabilities.profile import CapProfile from weboob.tools.backend import Module, BackendConfig @@ -34,7 +34,7 @@ __all__ = ['CragrModule'] -class CragrModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile): +class CragrModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile): NAME = 'cragr' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/creditdunord/module.py b/modules/creditdunord/module.py index b6f084e731..0dac513052 100644 --- a/modules/creditdunord/module.py +++ b/modules/creditdunord/module.py @@ -19,7 +19,7 @@ from collections import OrderedDict -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.profile import CapProfile from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value @@ -30,7 +30,7 @@ __all__ = ['CreditDuNordModule'] -class CreditDuNordModule(Module, CapBank, CapProfile): +class CreditDuNordModule(Module, CapBankWealth, CapProfile): NAME = 'creditdunord' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/creditdunordpee/module.py b/modules/creditdunordpee/module.py index 5a0fb50f41..df19ac80b1 100644 --- a/modules/creditdunordpee/module.py +++ b/modules/creditdunordpee/module.py @@ -21,7 +21,7 @@ from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword -from weboob.capabilities.bank import CapBank +from weboob.capabilities.bank import CapBankWealth from .browser import CreditdunordpeeBrowser @@ -29,7 +29,7 @@ __all__ = ['CreditdunordpeeModule'] -class CreditdunordpeeModule(Module, CapBank): +class CreditdunordpeeModule(Module, CapBankWealth): NAME = 'creditdunordpee' DESCRIPTION = u'Site de gestion du PEE du groupe Credit du nord' MAINTAINER = u'Bezleputh' diff --git a/modules/creditmutuel/module.py b/modules/creditmutuel/module.py index 5672ba3254..20df54bca3 100644 --- a/modules/creditmutuel/module.py +++ b/modules/creditmutuel/module.py @@ -22,7 +22,7 @@ from decimal import Decimal from weboob.capabilities.base import find_object -from weboob.capabilities.bank import CapBankTransferAddRecipient, AccountNotFound, RecipientNotFound, \ +from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, RecipientNotFound, \ Account, TransferError from weboob.capabilities.contact import CapContact from weboob.capabilities.profile import CapProfile @@ -35,7 +35,7 @@ __all__ = ['CreditMutuelModule'] -class CreditMutuelModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile): +class CreditMutuelModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile): NAME = 'creditmutuel' MAINTAINER = u'Julien Veyssier' EMAIL = 'julien.veyssier@aiur.fr' diff --git a/modules/fortuneo/module.py b/modules/fortuneo/module.py index a7c8e38af1..cc529c180f 100644 --- a/modules/fortuneo/module.py +++ b/modules/fortuneo/module.py @@ -19,7 +19,7 @@ from weboob.capabilities.base import find_object -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword @@ -29,7 +29,7 @@ __all__ = ['FortuneoModule'] -class FortuneoModule(Module, CapBank): +class FortuneoModule(Module, CapBankWealth): NAME = 'fortuneo' MAINTAINER = u'Gilles-Alexandre Quenot' EMAIL = 'gilles.quenot@gmail.com' diff --git a/modules/groupama/module.py b/modules/groupama/module.py index bc1c035954..97d426e067 100644 --- a/modules/groupama/module.py +++ b/modules/groupama/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import Value, ValueBackendPassword @@ -29,7 +29,7 @@ __all__ = ['GroupamaModule'] -class GroupamaModule(Module, CapBank): +class GroupamaModule(Module, CapBankWealth): NAME = 'groupama' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/groupamaes/module.py b/modules/groupamaes/module.py index a63c36b58d..9fd02141aa 100644 --- a/modules/groupamaes/module.py +++ b/modules/groupamaes/module.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 CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankPockets, AccountNotFound from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from weboob.capabilities.base import find_object @@ -28,7 +28,7 @@ __all__ = ['GroupamaesModule'] -class GroupamaesModule(Module, CapBank): +class GroupamaesModule(Module, CapBankPockets): NAME = 'groupamaes' DESCRIPTION = u"Groupama Épargne Salariale" MAINTAINER = u'Bezleputh' diff --git a/modules/hsbc/module.py b/modules/hsbc/module.py index 45b2f859ee..226ccc1b7a 100644 --- a/modules/hsbc/module.py +++ b/modules/hsbc/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword, Value @@ -29,7 +29,7 @@ __all__ = ['HSBCModule'] -class HSBCModule(Module, CapBank): +class HSBCModule(Module, CapBankWealth): NAME = 'hsbc' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/ing/module.py b/modules/ing/module.py index 855d3b3ade..9f5c241cca 100644 --- a/modules/ing/module.py +++ b/modules/ing/module.py @@ -20,7 +20,7 @@ import re from datetime import timedelta -from weboob.capabilities.bank import CapBankTransfer, Account, AccountNotFound, RecipientNotFound +from weboob.capabilities.bank import CapBankWealth, CapBankTransfer, Account, AccountNotFound, RecipientNotFound from weboob.capabilities.bill import CapDocument, Bill, Subscription,\ SubscriptionNotFound, DocumentNotFound from weboob.capabilities.profile import CapProfile @@ -34,7 +34,7 @@ __all__ = ['INGModule'] -class INGModule(Module, CapBankTransfer, CapDocument, CapProfile): +class INGModule(Module, CapBankWealth, CapBankTransfer, CapDocument, CapProfile): NAME = 'ing' MAINTAINER = u'Florent Fourcot' EMAIL = 'weboob@flo.fourcot.fr' diff --git a/modules/lcl/module.py b/modules/lcl/module.py index c2e65b3739..4f001b319e 100644 --- a/modules/lcl/module.py +++ b/modules/lcl/module.py @@ -22,7 +22,7 @@ from functools import wraps import re -from weboob.capabilities.bank import CapBankTransferAddRecipient, AccountNotFound, \ +from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, \ RecipientNotFound, TransferError, Account from weboob.capabilities.bill import CapDocument, Subscription, SubscriptionNotFound, \ Document, DocumentNotFound @@ -53,7 +53,7 @@ def wrapper(self, *args, **kwargs): return decorator -class LCLModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile, CapDocument): +class LCLModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile, CapDocument): NAME = 'lcl' MAINTAINER = u'Romain Bignon' EMAIL = 'romain@weboob.org' diff --git a/modules/pradoepargne/module.py b/modules/pradoepargne/module.py index 077958859a..d43aa2a5e0 100644 --- a/modules/pradoepargne/module.py +++ b/modules/pradoepargne/module.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from weboob.capabilities.base import find_object @@ -29,7 +29,7 @@ __all__ = ['PradoepargneModule'] -class PradoepargneModule(Module, CapBank): +class PradoepargneModule(Module, CapBankWealth): NAME = 'pradoepargne' DESCRIPTION = u'Prado Épargne Salariale' MAINTAINER = u'Edouard Lambert' diff --git a/modules/s2e/module.py b/modules/s2e/module.py index 56d88a67f9..ed12168c20 100644 --- a/modules/s2e/module.py +++ b/modules/s2e/module.py @@ -19,11 +19,11 @@ from weboob.tools.backend import Module -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankPockets, AccountNotFound from weboob.capabilities.base import find_object -class S2eModule(Module, CapBank): +class S2eModule(Module, CapBankPockets): NAME = 's2e' DESCRIPTION = u'Épargne Salariale' MAINTAINER = u'Edouard Lambert' diff --git a/modules/societegenerale/module.py b/modules/societegenerale/module.py index 0b927de7f6..c0c46e5984 100644 --- a/modules/societegenerale/module.py +++ b/modules/societegenerale/module.py @@ -22,7 +22,7 @@ from decimal import Decimal from datetime import timedelta -from weboob.capabilities.bank import CapBankTransferAddRecipient, AccountNotFound, Account, RecipientNotFound +from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, Account, RecipientNotFound from weboob.capabilities.contact import CapContact from weboob.capabilities.profile import CapProfile from weboob.tools.backend import Module, BackendConfig @@ -36,7 +36,7 @@ __all__ = ['SocieteGeneraleModule'] -class SocieteGeneraleModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile): +class SocieteGeneraleModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile): NAME = 'societegenerale' MAINTAINER = u'Jocelyn Jaubert' EMAIL = 'jocelyn.jaubert@gmail.com' diff --git a/modules/spirica/module.py b/modules/spirica/module.py index afd8afb127..04b50bdc74 100644 --- a/modules/spirica/module.py +++ b/modules/spirica/module.py @@ -20,7 +20,7 @@ from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object from .browser import SpiricaBrowser @@ -29,7 +29,7 @@ __all__ = ['SpiricaModule'] -class SpiricaModule(Module, CapBank): +class SpiricaModule(Module, CapBankWealth): NAME = 'spirica' DESCRIPTION = u'Spirica' MAINTAINER = u'Edouard Lambert' diff --git a/modules/yomoni/module.py b/modules/yomoni/module.py index d24c5a9228..6cb9aef2c6 100644 --- a/modules/yomoni/module.py +++ b/modules/yomoni/module.py @@ -20,7 +20,7 @@ from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword -from weboob.capabilities.bank import CapBank, AccountNotFound +from weboob.capabilities.bank import CapBankWealth, AccountNotFound from weboob.capabilities.base import find_object from .browser import YomoniBrowser @@ -29,7 +29,7 @@ __all__ = ['YomoniModule'] -class YomoniModule(Module, CapBank): +class YomoniModule(Module, CapBankWealth): NAME = 'yomoni' DESCRIPTION = u'Yomoni' MAINTAINER = u'Edouard Lambert' diff --git a/weboob/capabilities/bank.py b/weboob/capabilities/bank.py index 24e433b484..d854dc2c25 100644 --- a/weboob/capabilities/bank.py +++ b/weboob/capabilities/bank.py @@ -510,6 +510,18 @@ def iter_coming(self, account): """ raise NotImplementedError() + +class CapCgp(CapBank): + """ + Capability of cgp website to see accounts and transactions. + """ + + +class CapBankWealth(CapBank): + """ + Capability of bank websites to see investment. + """ + def iter_investment(self, account): """ Iter investment of a market account @@ -521,6 +533,12 @@ def iter_investment(self, account): """ raise NotImplementedError() + +class CapBankPockets(CapBankWealth): + """ + Capability of bank websites to see pockets. + """ + def iter_pocket(self, account): """ Iter pocket @@ -533,12 +551,6 @@ def iter_pocket(self, account): raise NotImplementedError() -class CapCgp(CapBank): - """ - Capability of cgp website to see accounts and transactions. - """ - - class CapBankTransfer(CapBank): def iter_transfer_recipients(self, account): """ -- GitLab