From 1b4f750888f0b105b9d9274f3c7c6c153bbcc0e7 Mon Sep 17 00:00:00 2001 From: smurail Date: Wed, 17 Sep 2014 15:53:27 +0200 Subject: [PATCH] minor fix of JSVar --- weboob/tools/browser2/filters/javascript.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weboob/tools/browser2/filters/javascript.py b/weboob/tools/browser2/filters/javascript.py index 705c2fcc..09e998ca 100644 --- a/weboob/tools/browser2/filters/javascript.py +++ b/weboob/tools/browser2/filters/javascript.py @@ -97,8 +97,8 @@ class JSVar(Regexp): for t, v in values.iteritems(): if v is not None: break - if self.of_type and t != self.of_type.__name__: - raise ParseError('Variable %r of type %s not found' % (self.var, self.of_type)) + if self.of_type and t != self.of_type: + raise ParseError('Variable %r with type %s not found' % (self.var, self.of_type)) if t in ('int', 'float'): v = self._re_spaces.sub('', v).lower() if t == 'int': @@ -118,7 +118,7 @@ class JSVar(Regexp): def __init__(self, selector=None, var=None, of_type=None, default=_NO_DEFAULT): assert var is not None, 'Please specify a var parameter' 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 super(JSVar, self).__init__(selector, pattern=pattern, template=self.to_python, default=default)