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

several of little fixes

Browse source
This commit is contained in:
Romain Bignon 2014-03-14 00:18:05 +01:00
commit a74b31df33
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,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.browser.page and isinstance(self.browser.page, self.klass): if self.is_here():
return self.browser.page return self.browser.page
return self.go(**kwargs) return self.go(**kwargs)
@ -89,7 +89,8 @@ 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')
""" """
return self.browser.location(self.build(**kwargs)) r = self.browser.location(self.build(**kwargs))
return r.page or r
def build(self, **kwargs): def build(self, **kwargs):
patterns = [] patterns = []
@ -117,6 +118,9 @@ class URL(object):
""" """
Handle a HTTP response to get an instance of the klass if it matches. Handle a HTTP response to get an instance of the klass if it matches.
""" """
if self.klass is None:
return
m = self.match(response.url) m = self.match(response.url)
if m: if m:
return self.klass(self.browser, response, m.groupdict()) return self.klass(self.browser, response, m.groupdict())
@ -228,10 +232,11 @@ class PagesBrowser(DomainBrowser):
# Call load hook. # Call load hook.
self.page.on_load() self.page.on_load()
return response # Returns self.response in case on_load recalls location()
return self.response
def pagination(self, func, *args, **kwargs): def pagination(self, func, *args, **kwargs):
""" r"""
This helper function can be used to handle pagination pages easily. This helper function can be used to handle pagination pages easily.
When the called function raises an exception `NextPage`, it goes on the When the called function raises an exception `NextPage`, it goes on the
@ -272,6 +277,7 @@ class NextPage(Exception):
See PagesBrowser.pagination. See PagesBrowser.pagination.
""" """
def __init__(self, request): def __init__(self, request):
super(NextPage, self).__init__()
self.request = request self.request = request
@ -347,6 +353,10 @@ class Form(OrderedDict):
name = el.attrib['name'] name = el.attrib['name']
except KeyError: except KeyError:
continue continue
if el.attrib['type'] == 'checkbox' and not 'checked' in el:
continue
value = el.attrib.get('value', u'') value = el.attrib.get('value', u'')
self[name] = value self[name] = value
@ -544,6 +554,8 @@ class ItemElement(AbstractElement):
self.obj = None self.obj = None
def build_object(self): def build_object(self):
if self.klass is None:
return
return self.klass() return self.klass()
def __call__(self, obj=None): def __call__(self, obj=None):