[utils] Correct octal/hexadecimal number detection in js_to_json

diff --git a/ChangeLog b/ChangeLog
index e99ffcec66c66167d9e49dde1f6b1c8856c08a66..98a3dbca3bde37e951236400ae92d4b2792a44b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+version <unreleased>
+
+Core
+* Fix js_to_json(): correct octal or hexadecimal number detection
+
+
 version 2016.08.19
 
 Core

diff --git a/test/test_utils.py b/test/test_utils.py
index cb578cd536ab0db6161306ccb795206851f24234..b83da93b4e15432f192a731f398ffd75b1df1dc0 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -712,6 +712,9 @@ class TestUtil(unittest.TestCase):
         inp = '''{"foo":101}'''
         self.assertEqual(js_to_json(inp), '''{"foo":101}''')
 
+        inp = '''{"duration": "00:01:07"}'''
+        self.assertEqual(js_to_json(inp), '''{"duration": "00:01:07"}''')
+
     def test_js_to_json_edgecases(self):
         on = js_to_json("{abc_def:'1\\'\\\\2\\\\\\'3\"4'}")
         self.assertEqual(json.loads(on), {"abc_def": "1'\\2\\'3\"4"})

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 35362e7674205a62fd71ba347829a55e1f4f15a4..0c36c1b8028a8a3cf1128a213ee79b2cf0300482 100644 (file)
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -2038,14 +2038,14 @@ def js_to_json(code):
             }.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]+)\s*:?$', 16),
+            (r'^(0+[0-7]+)\s*:?$', 8),
         )
 
         for regex, base in INTEGER_TABLE:
             im = re.match(regex, v)
             if im:
-                i = int(im.group(0), base)
+                i = int(im.group(1), base)
                 return '"%d":' % i if v.endswith(':') else '%d' % i
 
         return '"%s"' % v