nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Raise BrowserBanned if IP banned

Browse source
This commit is contained in:
Florent 2013-09-24 13:58:30 +02:00
commit fa214f5760
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/poivy/browser.py
View file

@ -18,8 +18,8 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword
from .pages import HomePage, LoginPage, HistoryPage, BillsPage
from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrowserBanned
from .pages import HomePage, LoginPage, HistoryPage, BillsPage, ErrorPage
__all__ = ['PoivyBrowser']
@ -31,7 +31,8 @@ class PoivyBrowser(BaseBrowser):
PAGES = {'.*login': LoginPage,
'.*buy_credit.*': HomePage,
'.*/recent_calls': HistoryPage,
'.*purchases': BillsPage
'.*purchases': BillsPage,
'.*warning.*': ErrorPage
}
def __init__(self, *args, **kwargs):
@ -50,9 +51,10 @@ class PoivyBrowser(BaseBrowser):
if not self.is_on_page(LoginPage):
self.location('/login')
self.page.login(self.username, self.password)
if not self.page.login(self.username, self.password):
raise BrowserBanned('Too many connections from you IP address: captcha enabled')
if self.is_on_page(LoginPage):
if self.is_on_page(LoginPage) or self.is_on_page(ErrorPage):
raise BrowserIncorrectPassword()
def get_subscription_list(self):

11
modules/poivy/pages.py
View file

@ -25,7 +25,12 @@ from datetime import datetime, date, time
import re
__all__ = ['LoginPage', 'HomePage', 'HistoryPage', 'BillsPage']
__all__ = ['LoginPage', 'HomePage', 'HistoryPage', 'BillsPage', 'ErrorPage']
class ErrorPage(BasePage):
def on_loaded(self):
pass
class LoginPage(BasePage):
@ -39,12 +44,16 @@ class LoginPage(BasePage):
return False
def login(self, login, password):
captcha = self.document.xpath('label[@class="label_captcha_input"]')
if captcha is not None:
return False
# Form without name
self.browser.select_form(predicate=self._predicate_form)
self.browser.set_all_readonly(False)
self.browser['login[username]'] = login.encode('iso-8859-1')
self.browser['login[password]'] = password.encode('iso-8859-1')
self.browser.submit(nologin=True)
return True
class HomePage(BasePage):