From 7a91f9efae1d1f8ac3497bd84b4a0d73feefe3e5 Mon Sep 17 00:00:00 2001 From: Baptiste Delpey Date: Wed, 13 May 2015 15:52:51 +0200 Subject: [PATCH] paypal handle bad login/password --- modules/paypal/browser.py | 5 +++-- modules/paypal/pages.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/paypal/browser.py b/modules/paypal/browser.py index edf014ee..2d13a519 100644 --- a/modules/paypal/browser.py +++ b/modules/paypal/browser.py @@ -23,7 +23,7 @@ from dateutil.relativedelta import relativedelta from weboob.deprecated.browser import Browser, BrowserIncorrectPassword -from .pages import LoginPage, AccountPage, UselessPage, HomePage, ProHistoryPage, PartHistoryPage, HistoryDetailsPage +from .pages import LoginPage, AccountPage, UselessPage, HomePage, ProHistoryPage, PartHistoryPage, HistoryDetailsPage, ErrorPage __all__ = ['Paypal'] @@ -46,6 +46,7 @@ class Paypal(Browser): '/cgi-bin/webscr\?cmd=_account.*$': UselessPage, '/cgi-bin/webscr\?cmd=_login-done.+$': UselessPage, '/cgi-bin/webscr\?cmd=_home&country_lang.x=true$': HomePage, + '/auth/validatecaptcha$': ErrorPage, 'https://\w+.paypal.com/cgi-bin/webscr\?cmd=_history-details-from-hub&id=[A-Z0-9]+$': HistoryDetailsPage, 'https://\w+.paypal.com/webapps/business/\?nav=0.0': HomePage, 'https://\w+.paypal.com/webapps/business/\?country_lang.x=true': HomePage, @@ -95,7 +96,7 @@ class Paypal(Browser): self.page.login(self.username, self.password) self.page.validate_useless_captacha() - if self.is_on_page(LoginPage): + if self.is_on_page(LoginPage) or self.is_on_page(ErrorPage): raise BrowserIncorrectPassword() self.find_account_type() diff --git a/modules/paypal/pages.py b/modules/paypal/pages.py index 428e4563..1e4443ab 100644 --- a/modules/paypal/pages.py +++ b/modules/paypal/pages.py @@ -68,6 +68,8 @@ class LoginPage(Page): self.browser.submit(nologin=True) +class ErrorPage(Page): + pass class UselessPage(Page): pass