From 26e7604cd4ed7cf7c2058fc49187cdf0a05df612 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Thu, 11 Nov 2010 14:30:40 +0100 Subject: [PATCH] use exception AdopteBanned instead of BrowserUnavailable --- weboob/backends/aum/pages/base.py | 5 +++-- weboob/backends/aum/pages/login.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/weboob/backends/aum/pages/base.py b/weboob/backends/aum/pages/base.py index b039e24a..50cb199a 100644 --- a/weboob/backends/aum/pages/base.py +++ b/weboob/backends/aum/pages/base.py @@ -18,6 +18,7 @@ import re from weboob.tools.browser import BasePage, BrowserUnavailable +from weboob.backends.aum.exceptions import AdopteBanned class PageBase(BasePage): def __init__(self, *args, **kwargs): @@ -27,12 +28,12 @@ class PageBase(BasePage): b = self.document.getElementsByTagName('body')[0] for div in b.getElementsByTagName('div'): if div.getAttribute('id') == 'oops': - raise BrowserUnavailable() + raise BrowserUnavailable('Oops') # Check when the account is temporarily blocked. for img in self.document.getElementsByTagName('img'): if img.getAttribute('src') == 'http://s.adopteunmec.com/img/exemple.jpg': - raise BrowserUnavailable('Your account is blocked. You have to unblock by yourself but we can\'t help you.') + raise AdopteBanned('Your account is blocked. You have to unblock by yourself but we can\'t help you.') def open_contact_list_page(self): self.browser.follow_link(url_regex=r"/mails.php$") diff --git a/weboob/backends/aum/pages/login.py b/weboob/backends/aum/pages/login.py index 723d6d41..a68eeee2 100644 --- a/weboob/backends/aum/pages/login.py +++ b/weboob/backends/aum/pages/login.py @@ -19,7 +19,8 @@ import re from weboob.tools.mech import ClientForm -from weboob.tools.browser import BrowserIncorrectPassword, BrowserUnavailable +from weboob.tools.browser import BrowserIncorrectPassword +from weboob.backends.aum.exceptions import AdopteBanned from weboob.capabilities.account import AccountRegisterError from .base import PageBase @@ -114,7 +115,7 @@ class RedirectPage(PageBase): class BanPage(PageBase): def on_loaded(self): - raise BrowserUnavailable('Your IP address is banned.') + raise AdopteBanned('Your IP address is banned.') class ShopPage(PageBase): pass