From 0329c73067013a4fbde7fe3c53a967103eb8c905 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Thu, 20 Dec 2012 16:22:18 +0100 Subject: [PATCH] fix navigation --- modules/barclays/browser.py | 6 ++++++ modules/barclays/pages.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/barclays/browser.py b/modules/barclays/browser.py index ae92fbd1..cecdbe92 100644 --- a/modules/barclays/browser.py +++ b/modules/barclays/browser.py @@ -94,6 +94,9 @@ class Barclays(BaseBrowser): return None def get_history(self, account): + if not self.is_on_page(AccountsPage): + self.location('tbord.do') + self.location(account._link) assert self.is_on_page((TransactionsPage, ValuationPage)) @@ -101,6 +104,9 @@ class Barclays(BaseBrowser): return self.page.get_history() def get_coming_operations(self, account): + if not self.is_on_page(AccountsPage): + self.location('tbord.do') + for card in account._card_links: self.location(card) diff --git a/modules/barclays/pages.py b/modules/barclays/pages.py index 02ebe2b8..db30833c 100644 --- a/modules/barclays/pages.py +++ b/modules/barclays/pages.py @@ -160,7 +160,7 @@ class CardPage(BasePage): raw = u' '.join([txt.strip() for txt in tds[1].itertext()]) amount = u''.join([txt.strip() for txt in tds[-1].itertext()]) t.parse(date, re.sub(r'[ ]+', ' ', raw)) - t.label = tds[1].find('span').text.strip() + t.label = unicode(tds[1].find('span').text.strip()) t.type = t.TYPE_CARD t.set_amount(amount) yield t