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

Also check arguments with is_here()

Browse source 
Otherwise, something like that would never work:
page.stay_or_go(id=1)
page.stay_or_go(id=2)  # would stay on URL for id=1

To avoid breaking simple usage of is_here(), if no arguments are
provided, then there are no checks.

That means:
page.stay_or_go(id=1)
page.stay_or_go()  # nothing happens
This commit is contained in:
Laurent Bachelier 2014-03-22 01:01:32 +01:00 • committed by Romain Bignon
commit 0927230e95
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
weboob/tools/browser2/page.py
View file

@ -62,11 +62,18 @@ class URL(object):
self._creation_counter = URL._creation_counter self._creation_counter = URL._creation_counter
URL._creation_counter += 1 URL._creation_counter += 1
def is_here(self): def is_here(self, **kwargs):
""" """
Returns True if the current page of browser matches this URL. Returns True if the current page of browser matches this URL.
If arguments are provided, and only then, they are checked against the arguments
that were used to build the current page URL.
""" """
return self.browser.page and isinstance(self.browser.page, self.klass) if len(kwargs):
params = self.match(self.browser.absurl(self.build(**kwargs), base=True)).groupdict()
else:
params = None
return self.browser.page and isinstance(self.browser.page, self.klass) \
and (params is None or params == self.browser.page.params)
def stay_or_go(self, **kwargs): def stay_or_go(self, **kwargs):
""" """
@ -77,7 +84,7 @@ class URL(object):
>>> url = URL('http://exawple.org/(?P<pagename>).html') >>> url = URL('http://exawple.org/(?P<pagename>).html')
>>> url.stay_or_go(pagename='index') >>> url.stay_or_go(pagename='index')
""" """
if self.is_here(): if self.is_here(**kwargs):
return self.browser.page return self.browser.page
return self.go(**kwargs) return self.go(**kwargs)