From a045024e80cde4fb89f5f5b90f4ff7b28634ad97 Mon Sep 17 00:00:00 2001
From: Romain Bignon <romain@peerfuse.org>
Date: Sat, 3 Apr 2010 17:34:09 +0200
Subject: [PATCH] [backends.aum] little fixes

---
 weboob/backends/aum/adopte.py      | 15 ++++++++-------
 weboob/backends/aum/pages/base.py  |  3 ---
 weboob/backends/aum/pages/login.py |  5 ++++-
 weboob/tools/browser.py            |  3 +++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/weboob/backends/aum/adopte.py b/weboob/backends/aum/adopte.py
index 07d6fb8b..62ef64bd 100644
--- a/weboob/backends/aum/adopte.py
+++ b/weboob/backends/aum/adopte.py
@@ -31,7 +31,7 @@ from weboob.backends.aum.pages.contact_thread import ContactThreadPage
 from weboob.backends.aum.pages.baskets import BasketsPage
 from weboob.backends.aum.pages.profile import ProfilePage
 from weboob.backends.aum.pages.search import SearchPage
-from weboob.backends.aum.pages.login import LoginPage, RedirectPage, BanPage, ErrPage, RegisterPage, RegisterWaitPage, RegisterConfirmPage
+from weboob.backends.aum.pages.login import LoginPage, RedirectPage, BanPage, ErrPage, RegisterPage, RegisterWaitPage, RegisterConfirmPage, ShopPage
 from weboob.backends.aum.pages.edit import EditPhotoPage, EditPhotoCbPage, EditAnnouncePage, EditDescriptionPage, EditSexPage, EditPersonalityPage
 from weboob.backends.aum.pages.wait import WaitPage
 
@@ -49,13 +49,14 @@ class AdopteUnMec(Browser):
              'http://www.adopteunmec.com/index.html': LoginPage,
              'http://www.adopteunmec.com/index.php': LoginPage,
              'http://www.adopteunmec.com/loginErr.php.*': ErrPage,
-             'http://www.adopteunmec.com/bans.php\?who=auto': BanPage,
+             'http://www.adopteunmec.com/bans.php.*': BanPage,
              'http://www.adopteunmec.com/redirect.php\?action=login': RedirectPage,
              'http://www.adopteunmec.com/wait.php': WaitPage,
              'http://www.adopteunmec.com/register2.php': RegisterPage,
              'http://www.adopteunmec.com/register3.php.*': RegisterWaitPage,
              'http://www.adopteunmec.com/register4.php.*': RegisterConfirmPage,
              'http://www.adopteunmec.com/home.php': HomePage,
+             'http://www.adopteunmec.com/shop2c.php': ShopPage,
              'http://www.adopteunmec.com/mails.php': ContactListPage,
              'http://www.adopteunmec.com/mails.php\?type=1': BasketsPage,
              'http://www.adopteunmec.com/thread.php\?id=([0-9]+)': ContactThreadPage,
@@ -133,13 +134,13 @@ class AdopteUnMec(Browser):
 
     @pageaccess
     def score(self):
-        if time.time() - self.__last_update > 60:
+        if time.time() - self.last_update > 60:
             self.home()
         return self.page.score()
 
     @pageaccess
     def get_my_name(self):
-        if time.time() - self.__last_update > 60:
+        if time.time() - self.last_update > 60:
             self.home()
         return self.page.get_my_name()
 
@@ -155,19 +156,19 @@ class AdopteUnMec(Browser):
 
     @pageaccess
     def nb_new_mails(self):
-        if time.time() - self.__last_update > 60:
+        if time.time() - self.last_update > 60:
             self.home()
         return self.page.nb_new_mails()
 
     @pageaccess
     def nb_new_baskets(self):
-        if time.time() - self.__last_update > 60:
+        if time.time() - self.last_update > 60:
             self.home()
         return self.page.nb_new_baskets()
 
     @pageaccess
     def nb_new_visites(self):
-        if time.time() - self.__last_update > 60:
+        if time.time() - self.last_update > 60:
             self.home()
         return self.page.nb_new_visites()
 
diff --git a/weboob/backends/aum/pages/base.py b/weboob/backends/aum/pages/base.py
index bb56d213..885abe54 100644
--- a/weboob/backends/aum/pages/base.py
+++ b/weboob/backends/aum/pages/base.py
@@ -84,13 +84,10 @@ class PageBase(BasePage):
         return '?'
 
     def nb_new_mails(self):
-
         return self.__get_indicator(u'mailsCounter')
 
     def nb_new_baskets(self):
-
         return self.__get_indicator(u'flashsCounter')
 
     def nb_new_visites(self):
-
         return self.__get_indicator(u'visitesCounter')
diff --git a/weboob/backends/aum/pages/login.py b/weboob/backends/aum/pages/login.py
index bad3caa3..73ff1d5c 100644
--- a/weboob/backends/aum/pages/login.py
+++ b/weboob/backends/aum/pages/login.py
@@ -77,6 +77,9 @@ class RedirectPage(PageBase):
 class BanPage(PageBase):
     pass
 
+class ShopPage(PageBase):
+    pass
+
 class ErrPage(PageBase):
     def loaded(self):
-        raise BrowserIncorrectPassword()
+        raise BrowserIncorrectPassword('Incorrect login/password')
diff --git a/weboob/tools/browser.py b/weboob/tools/browser.py
index ab0f7866..5828fd67 100644
--- a/weboob/tools/browser.py
+++ b/weboob/tools/browser.py
@@ -41,6 +41,9 @@ else:
 class BrowserIncorrectPassword(Exception):
     pass
 
+class BrowserBanned(BrowserIncorrectPassword):
+    pass
+
 class BrowserUnavailable(Exception):
     pass