From e4468ca636b11a3a935cfefed74249e16b6a61b9 Mon Sep 17 00:00:00 2001 From: Maxime Gasselin Date: Thu, 14 May 2020 13:37:09 +0200 Subject: [PATCH] [banquepopulaire] Use MapIn to get user type info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It would be more flexible (ex for "Personne Morale (hors SP)". Moreover "Personne Protégé" is added to the list. --- modules/banquepopulaire/pages.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/banquepopulaire/pages.py b/modules/banquepopulaire/pages.py index d5888069f8..b0846109ed 100644 --- a/modules/banquepopulaire/pages.py +++ b/modules/banquepopulaire/pages.py @@ -28,7 +28,10 @@ from PIL import Image, ImageFilter from weboob.browser.elements import method, DictElement, ItemElement -from weboob.browser.filters.standard import CleanText, CleanDecimal, Regexp, Eval, Date, Field +from weboob.browser.filters.standard import ( + CleanText, CleanDecimal, Regexp, Eval, + Date, Field, MapIn, +) from weboob.browser.filters.html import Attr, Link, AttributeNotFound from weboob.browser.filters.json import Dict from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, ActionNeeded @@ -347,13 +350,12 @@ def get_access_token(self): def get_user_type(self): user_subscription = Dict('characteristics/subscribeTypeItems/0/label')(self.doc) user_types = { - 'abonnement Particulier': 'part', - 'abonnement Personne Morale': 'ent', - 'abonnement EI (pro)': 'pro', + 'Particulier': 'part', + 'Personne Protégé': 'part', + 'Personne Morale': 'ent', + 'EI': 'pro', } - user_type = user_types.get(user_subscription) - assert user_type, "%s user type is not yet handle" % user_subscription - return user_type + return MapIn(self.doc, user_types).filter(user_subscription) class VkImagePage(AbstractPage): -- GitLab