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

minor fix of JSVar

Browse source
This commit is contained in:
smurail 2014-09-17 15:53:27 +02:00 • committed by Romain Bignon
commit 1b4f750888
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
weboob/tools/browser2/filters/javascript.py
View file

@ -97,8 +97,8 @@ class JSVar(Regexp):
for t, v in values.iteritems(): for t, v in values.iteritems():
if v is not None: if v is not None:
break break
if self.of_type and t != self.of_type.__name__: if self.of_type and t != self.of_type:
raise ParseError('Variable %r of type %s not found' % (self.var, self.of_type)) raise ParseError('Variable %r with type %s not found' % (self.var, self.of_type))
if t in ('int', 'float'): if t in ('int', 'float'):
v = self._re_spaces.sub('', v).lower() v = self._re_spaces.sub('', v).lower()
if t == 'int': if t == 'int':
@ -118,7 +118,7 @@ class JSVar(Regexp):
def __init__(self, selector=None, var=None, of_type=None, default=_NO_DEFAULT): def __init__(self, selector=None, var=None, of_type=None, default=_NO_DEFAULT):
assert var is not None, 'Please specify a var parameter' assert var is not None, 'Please specify a var parameter'
self.var = var self.var = var
self.of_type = of_type self.of_type = of_type.__name__ if type(of_type) == type else of_type
pattern = self.pattern_template % var pattern = self.pattern_template % var
super(JSVar, self).__init__(selector, pattern=pattern, template=self.to_python, default=default) super(JSVar, self).__init__(selector, pattern=pattern, template=self.to_python, default=default)