[utils] Simplify integer conversion in js_to_json

This commit is contained in:
Sergey M․ 2016-05-14 23:41:57 +06:00
parent 5d39176f6d
commit cda6d47aad
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

View File

@ -1926,14 +1926,14 @@ def fix_kv(m):
}.get(m.group(0), m.group(0)), v[1:-1])
INTEGER_TABLE = (
(r'^(0[xX][0-9a-fA-F]+)', 16),
(r'^(0+[0-7]+)', 8),
(r'^0[xX][0-9a-fA-F]+', 16),
(r'^0+[0-7]+', 8),
)
for regex, base in INTEGER_TABLE:
im = re.match(regex, v)
if im:
i = int(im.group(1), base)
i = int(im.group(0), base)
return '"%d":' % i if v.endswith(':') else '%d' % i
return '"%s"' % v