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

JSVar: fix encoding issues and simplify code

Browse source
This commit is contained in:
smurail 2014-09-23 17:23:39 +02:00 • committed by Romain Bignon
commit 26c929ff9d
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@
import re import re
from ast import literal_eval
from weboob.tools.browser2.filters.standard import Filter, Regexp, RegexpError from weboob.tools.browser2.filters.standard import Filter, Regexp, RegexpError
from weboob.tools.exceptions import ParseError from weboob.tools.exceptions import ParseError
@ -97,6 +98,7 @@ class JSVar(Regexp):
_re_spaces = re.compile(r'\s+') _re_spaces = re.compile(r'\s+')
def to_python(self, m): def to_python(self, m):
"Convert MatchObject to python value"
values = m.groupdict() values = m.groupdict()
for t, v in values.iteritems(): for t, v in values.iteritems():
if v is not None: if v is not None:
@ -104,13 +106,9 @@ class JSVar(Regexp):
if self.need_type and t != self.need_type: if self.need_type and t != self.need_type:
raise ParseError('Variable %r with type %s not found' % (self.var, self.need_type)) raise ParseError('Variable %r with type %s not found' % (self.var, self.need_type))
if t in ('int', 'float'): if t in ('int', 'float'):
v = self._re_spaces.sub('', v).lower() return literal_eval(v)
if t == 'int':
base = {'x': 16, 'o': 8, 'b': 2}.get(v[1], 10) if v[0] == '0' else 10
return int(v, base=base)
return float(v)
if t == 'str': if t == 'str':
return v[1:-1].decode('string_escape') return literal_eval(v).decode('utf-8')
if t == 'bool': if t == 'bool':
return v == 'true' return v == 'true'
if t == 'None': if t == 'None':