[utils] Simplify integer conversion in js_to_json
This commit is contained in:
parent
5d39176f6d
commit
cda6d47aad
|
@ -1926,14 +1926,14 @@ def js_to_json(code):
|
||||||
}.get(m.group(0), m.group(0)), v[1:-1])
|
}.get(m.group(0), m.group(0)), v[1:-1])
|
||||||
|
|
||||||
INTEGER_TABLE = (
|
INTEGER_TABLE = (
|
||||||
(r'^(0[xX][0-9a-fA-F]+)', 16),
|
(r'^0[xX][0-9a-fA-F]+', 16),
|
||||||
(r'^(0+[0-7]+)', 8),
|
(r'^0+[0-7]+', 8),
|
||||||
)
|
)
|
||||||
|
|
||||||
for regex, base in INTEGER_TABLE:
|
for regex, base in INTEGER_TABLE:
|
||||||
im = re.match(regex, v)
|
im = re.match(regex, v)
|
||||||
if im:
|
if im:
|
||||||
i = int(im.group(1), base)
|
i = int(im.group(0), base)
|
||||||
return '"%d":' % i if v.endswith(':') else '%d' % i
|
return '"%d":' % i if v.endswith(':') else '%d' % i
|
||||||
|
|
||||||
return '"%s"' % v
|
return '"%s"' % v
|
||||||
|
|
Loading…
Reference in New Issue