From 42de7aa5a3ad76ca7af57fda52d5288347d40826 Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Fri, 16 Apr 2010 17:29:48 +0200 Subject: [PATCH] rename BasePage.loaded() to on_loaded() --- weboob/backends/aum/pages/contact_list.py | 2 +- weboob/backends/aum/pages/contact_thread.py | 2 +- weboob/backends/aum/pages/login.py | 4 ++-- weboob/backends/aum/pages/profile.py | 2 +- weboob/backends/aum/pages/profileslist_base.py | 2 +- weboob/backends/aum/pages/wait.py | 2 +- weboob/backends/bnporc/pages/account_coming.py | 2 +- weboob/backends/bnporc/pages/accounts_list.py | 2 +- weboob/backends/bnporc/pages/login.py | 2 +- weboob/backends/cragr/pages/accounts_list.py | 2 +- weboob/backends/cragr/pages/login.py | 2 +- weboob/backends/dlfp/pages/index.py | 2 +- weboob/backends/dlfp/pages/news.py | 2 +- weboob/backends/transilien/pages/route.py | 2 +- weboob/backends/youtube/pages/video.py | 2 +- weboob/tools/browser.py | 4 ++-- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/weboob/backends/aum/pages/contact_list.py b/weboob/backends/aum/pages/contact_list.py index 4ba0e9f3..843d4589 100644 --- a/weboob/backends/aum/pages/contact_list.py +++ b/weboob/backends/aum/pages/contact_list.py @@ -97,7 +97,7 @@ class ContactItem: class ContactListPage(PageBase): - def loaded(self): + def on_loaded(self): self.items = [] tags = self.document.getElementsByTagName('form')[0].childNodes[3].childNodes[1].childNodes diff --git a/weboob/backends/aum/pages/contact_thread.py b/weboob/backends/aum/pages/contact_thread.py index abbf6963..6c2709b0 100644 --- a/weboob/backends/aum/pages/contact_thread.py +++ b/weboob/backends/aum/pages/contact_thread.py @@ -266,7 +266,7 @@ class ContactThreadPage(PageBase): id_regexp = re.compile("/thread.php\?id=([0-9]+)") - def loaded(self): + def on_loaded(self): self.items = [] a_list = self.document.getElementsByTagName('a') diff --git a/weboob/backends/aum/pages/login.py b/weboob/backends/aum/pages/login.py index 082c0754..49243078 100644 --- a/weboob/backends/aum/pages/login.py +++ b/weboob/backends/aum/pages/login.py @@ -70,7 +70,7 @@ class RegisterConfirmPage(PageBase): pass class RedirectPage(PageBase): - def loaded(self): + def on_loaded(self): for link in self.browser.links(): print link self.browser.location('/wait.php') @@ -82,5 +82,5 @@ class ShopPage(PageBase): pass class ErrPage(PageBase): - def loaded(self): + def on_loaded(self): raise BrowserIncorrectPassword('Incorrect login/password') diff --git a/weboob/backends/aum/pages/profile.py b/weboob/backends/aum/pages/profile.py index 1f3f0385..90ab8325 100644 --- a/weboob/backends/aum/pages/profile.py +++ b/weboob/backends/aum/pages/profile.py @@ -235,7 +235,7 @@ class ProfilePage(PageBase, Profile): name = self.name return '' % name - def loaded(self): + def on_loaded(self): self.name = u'' self.description = u'' self.table = deepcopy(self.empty_table) diff --git a/weboob/backends/aum/pages/profileslist_base.py b/weboob/backends/aum/pages/profileslist_base.py index f1721215..c3995b51 100644 --- a/weboob/backends/aum/pages/profileslist_base.py +++ b/weboob/backends/aum/pages/profileslist_base.py @@ -28,7 +28,7 @@ class ProfilesListBase(PageBase): WITHOUT_PHOTO = 'http://s.adopteunmec.com/img/thumb0.gif' SHOW_WITHOUT_PHOTO = True - def loaded(self): + def on_loaded(self): self.id_list = [] diff --git a/weboob/backends/aum/pages/wait.py b/weboob/backends/aum/pages/wait.py index f379c35e..82d76083 100644 --- a/weboob/backends/aum/pages/wait.py +++ b/weboob/backends/aum/pages/wait.py @@ -24,7 +24,7 @@ from time import sleep class WaitPage(PageBase): - def loaded(self): + def on_loaded(self): raise AdopteWait() def check(self): diff --git a/weboob/backends/bnporc/pages/account_coming.py b/weboob/backends/bnporc/pages/account_coming.py index 63aec3c8..4f805895 100644 --- a/weboob/backends/bnporc/pages/account_coming.py +++ b/weboob/backends/bnporc/pages/account_coming.py @@ -23,7 +23,7 @@ from weboob.capabilities.bank import Operation class AccountComing(BasePage): - def loaded(self): + def on_loaded(self): self.operations = [] for tr in self.document.getiterator('tr'): diff --git a/weboob/backends/bnporc/pages/accounts_list.py b/weboob/backends/bnporc/pages/accounts_list.py index da0cc5e3..c5d6ea31 100644 --- a/weboob/backends/bnporc/pages/accounts_list.py +++ b/weboob/backends/bnporc/pages/accounts_list.py @@ -26,7 +26,7 @@ from weboob.tools.browser import BasePage class AccountsList(BasePage): LINKID_REGEXP = re.compile(".*ch4=(\w+).*") - def loaded(self): + def on_loaded(self): pass def get_list(self): diff --git a/weboob/backends/bnporc/pages/login.py b/weboob/backends/bnporc/pages/login.py index 5e14eaa5..f73c5566 100644 --- a/weboob/backends/bnporc/pages/login.py +++ b/weboob/backends/bnporc/pages/login.py @@ -25,7 +25,7 @@ from weboob.tools.browser import BasePage from weboob.backends.bnporc.captcha import Captcha, TileError class LoginPage(BasePage): - def loaded(self): + def on_loaded(self): pass def login(self, login, password): diff --git a/weboob/backends/cragr/pages/accounts_list.py b/weboob/backends/cragr/pages/accounts_list.py index 86ce69c2..cf9f00a0 100644 --- a/weboob/backends/cragr/pages/accounts_list.py +++ b/weboob/backends/cragr/pages/accounts_list.py @@ -22,7 +22,7 @@ from weboob.capabilities.bank import Account from .base import CragrBasePage class AccountsList(CragrBasePage): - def loaded(self): + def on_loaded(self): pass def get_list(self): diff --git a/weboob/backends/cragr/pages/login.py b/weboob/backends/cragr/pages/login.py index da0fa61c..8f1041e2 100644 --- a/weboob/backends/cragr/pages/login.py +++ b/weboob/backends/cragr/pages/login.py @@ -23,7 +23,7 @@ import ClientForm from .base import CragrBasePage class LoginPage(CragrBasePage): - def loaded(self): + def on_loaded(self): pass def login(self, login, password): diff --git a/weboob/backends/dlfp/pages/index.py b/weboob/backends/dlfp/pages/index.py index 3c611547..9c4f1f01 100644 --- a/weboob/backends/dlfp/pages/index.py +++ b/weboob/backends/dlfp/pages/index.py @@ -32,7 +32,7 @@ class IndexPage(DLFPPage): pass class LoginPage(DLFPPage): - def loaded(self): + def on_loaded(self): if self.has_error(): raise BrowserIncorrectPassword() diff --git a/weboob/backends/dlfp/pages/news.py b/weboob/backends/dlfp/pages/news.py index a7287800..d98eac4d 100644 --- a/weboob/backends/dlfp/pages/news.py +++ b/weboob/backends/dlfp/pages/news.py @@ -103,7 +103,7 @@ class Article(object): self.part2 = self.browser.tostring(div) class ContentPage(DLFPPage): - def loaded(self): + def on_loaded(self): self.article = None for div in self.document.find('body').find('div').findall('div'): self.parse_div(div) diff --git a/weboob/backends/transilien/pages/route.py b/weboob/backends/transilien/pages/route.py index eab26382..75de1436 100644 --- a/weboob/backends/transilien/pages/route.py +++ b/weboob/backends/transilien/pages/route.py @@ -21,5 +21,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from weboob.tools.browser import BasePage class RoutePage(BasePage): - def loaded(self): + def on_loaded(self): return diff --git a/weboob/backends/youtube/pages/video.py b/weboob/backends/youtube/pages/video.py index 8d4c3fca..3f856f03 100644 --- a/weboob/backends/youtube/pages/video.py +++ b/weboob/backends/youtube/pages/video.py @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from weboob.tools.browser import BasePage class VideoPage(BasePage): - def loaded(self): + def on_loaded(self): found = self.document.getroot().cssselect('meta[name=title]') if found: content = found[0].attrib['content'] diff --git a/weboob/tools/browser.py b/weboob/tools/browser.py index d017b765..e770e144 100644 --- a/weboob/tools/browser.py +++ b/weboob/tools/browser.py @@ -69,7 +69,7 @@ class BasePage(object): self.document = document self.url = url - def loaded(self): + def on_loaded(self): """ Called when the page is loaded. """ @@ -234,7 +234,7 @@ class BaseBrowser(mechanize.Browser): document = self.__parser.parse(result, self.ENCODING) self.page = pageCls(self, document, result.geturl()) - self.page.loaded() + self.page.on_loaded() if self.password is not None and not self.is_logged(): debug('!! Relogin !!')