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

Citibank module: don't wait for transactions if there's none. Fixes #1661

Browse source
This commit is contained in:
Oleg Plakhotniuk 2014-12-06 20:44:38 -06:00 • committed by Romain Bignon
commit ded29b8be8
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/citibank/browser.py
View file

@ -144,14 +144,14 @@ class Citibank(object):
raise AccountNotFound() raise AccountNotFound()
self._account_link().click() self._account_link().click()
self.wait_ajax() self.wait_ajax()
for span in self.wait('span.cM-maximizeButton'): for span in self.find('span.cM-maximizeButton'):
span.click() span.click()
for tr in self.wait('tr.payments,tr.purchase'): for tr in self.find('tr.payments,tr.purchase'):
trdata = lambda n: tr.find_element_by_css_selector( trdata = lambda n: tr.find_element_by_css_selector(
'td.cT-bodyTableColumn%i span.cT-line1' % n).text 'td.cT-bodyTableColumn%i span.cT-line1' % n).text
treid = tr.get_attribute('id').replace('rowID', 'rowIDExt') treid = tr.get_attribute('id').replace('rowID', 'rowIDExt')
tredata = {} tredata = {}
for tre in self.wait('tr#%s' % treid): for tre in self.find('tr#%s' % treid):
labels = [x.text for x in tre.find_elements_by_css_selector( labels = [x.text for x in tre.find_elements_by_css_selector(
'div.cT-labelItem')] 'div.cT-labelItem')]
values = [x.text for x in tre.find_elements_by_css_selector( values = [x.text for x in tre.find_elements_by_css_selector(
@ -219,11 +219,14 @@ class Citibank(object):
yield t yield t
self.finish() self.finish()
def find(self, selector):
self._logger.debug('Finding selector """%s""" on page %s' % (
selector, self._browser.current_url))
return self._browser.find_elements_by_css_selector(selector)
@retrying @retrying
def wait(self, selector): def wait(self, selector):
self._logger.debug('Waiting for selector """%s""" on page %s' % ( els = self.find(selector)
selector, self._browser.current_url))
els = self._browser.find_elements_by_css_selector(selector)
if not els: if not els:
raise OnceAgain() raise OnceAgain()
return els return els