diff --git a/modules/bred/bred/browser.py b/modules/bred/bred/browser.py index 47818ab48e11b915527a4e5164472c37d86caedf..5edbeda9f747884604fffa55cbe3767fe68e2399 100644 --- a/modules/bred/bred/browser.py +++ b/modules/bred/bred/browser.py @@ -49,7 +49,7 @@ class BredBrowser(LoginBrowser): '/pages-gestion-des-erreurs/erreur-technique', '/pages-gestion-des-erreurs/message-tiers-oppose', ErrorPage) universe = URL('/transactionnel/services/applications/menu/getMenuUnivers', UniversePage) - token = URL('/transactionnel/services/rest/User/nonce\?random=(?P.*)', TokenPage) + token = URL(r'/transactionnel/services/rest/User/nonce\?random=(?P.*)', TokenPage) move_universe = URL('/transactionnel/services/applications/listes/(?P.*)/default', MoveUniversePage) switch = URL('/transactionnel/services/rest/User/switch', SwitchPage) loans = URL('/transactionnel/services/applications/prets/liste', LoansPage) diff --git a/modules/bred/bred/pages.py b/modules/bred/bred/pages.py index 8e07e5d9447ee5448aaf5f2452f9b967d3e0a25e..64bcd833aa2f086cf83d6217bef5e50d6bb1f5bb 100644 --- a/modules/bred/bred/pages.py +++ b/modules/bred/bred/pages.py @@ -35,20 +35,20 @@ class Transaction(FrenchTransaction): - PATTERNS = [(re.compile('^.*Virement (?P.*)'), FrenchTransaction.TYPE_TRANSFER), - (re.compile(u'PRELEV SEPA (?P.*)'), FrenchTransaction.TYPE_ORDER), - (re.compile(u'.*Prélèvement.*'), FrenchTransaction.TYPE_ORDER), - (re.compile(u'^(REGL|Rgt)(?P.*)'), FrenchTransaction.TYPE_ORDER), - (re.compile('^(?P.*) Carte \d+\s+ LE (?P
\d{2})/(?P\d{2})/(?P\d{2})'), + PATTERNS = [(re.compile(r'^.*Virement (?P.*)'), FrenchTransaction.TYPE_TRANSFER), + (re.compile(r'PRELEV SEPA (?P.*)'), FrenchTransaction.TYPE_ORDER), + (re.compile(r'.*Prélèvement.*'), FrenchTransaction.TYPE_ORDER), + (re.compile(r'^(REGL|Rgt)(?P.*)'), FrenchTransaction.TYPE_ORDER), + (re.compile(r'^(?P.*) Carte \d+\s+ LE (?P
\d{2})/(?P\d{2})/(?P\d{2})'), FrenchTransaction.TYPE_CARD), - (re.compile(u'^Débit mensuel.*'), FrenchTransaction.TYPE_CARD_SUMMARY), - (re.compile(u"^Retrait d'espèces à un DAB (?P.*) CARTE [X\d]+ LE (?P
\d{2})/(?P\d{2})/(?P\d{2})"), + (re.compile(r'^Débit mensuel.*'), FrenchTransaction.TYPE_CARD_SUMMARY), + (re.compile(r"^Retrait d'espèces à un DAB (?P.*) CARTE [X\d]+ LE (?P
\d{2})/(?P\d{2})/(?P\d{2})"), FrenchTransaction.TYPE_WITHDRAWAL), - (re.compile(u'^Paiement de chèque (?P.*)'), FrenchTransaction.TYPE_CHECK), - (re.compile(u'^(Cotisation|Intérêts) (?P.*)'), FrenchTransaction.TYPE_BANK), - (re.compile(u'^(Remise Chèque|Remise de chèque)\s*(?P.*)'), FrenchTransaction.TYPE_DEPOSIT), - (re.compile('^Versement (?P.*)'), FrenchTransaction.TYPE_DEPOSIT), - (re.compile('^(?P.*)LE (?P
\d{2})/(?P\d{2})/(?P\d{2})\s*(?P.*)'), + (re.compile(r'^Paiement de chèque (?P.*)'), FrenchTransaction.TYPE_CHECK), + (re.compile(r'^(Cotisation|Intérêts) (?P.*)'), FrenchTransaction.TYPE_BANK), + (re.compile(r'^(Remise Chèque|Remise de chèque)\s*(?P.*)'), FrenchTransaction.TYPE_DEPOSIT), + (re.compile(r'^Versement (?P.*)'), FrenchTransaction.TYPE_DEPOSIT), + (re.compile(r'^(?P.*)LE (?P
\d{2})/(?P\d{2})/(?P\d{2})\s*(?P.*)'), FrenchTransaction.TYPE_UNKNOWN), ] @@ -222,8 +222,8 @@ def iter_history(self, account, operation_list, seen, today, coming): seen.add(t.id) d = date.fromtimestamp(op.get('dateDebit', op.get('dateOperation'))/1000) - op['details'] = [re.sub('\s+', ' ', i).replace('\x00', '') for i in op['details'] if i] # sometimes they put "null" elements... - label = re.sub('\s+', ' ', op['libelle']).replace('\x00', '') + op['details'] = [re.sub(r'\s+', ' ', i).replace('\x00', '') for i in op['details'] if i] # sometimes they put "null" elements... + label = re.sub(r'\s+', ' ', op['libelle']).replace('\x00', '') raw = ' '.join([label] + op['details']) t.rdate = date.fromtimestamp(op.get('dateOperation', op.get('dateDebit'))/1000) vdate = date.fromtimestamp(op.get('dateValeur', op.get('dateDebit', op.get('dateOperation')))/1000)