aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-04-04 17:48:55 +0600
committerSergey M․ <dstftw@gmail.com>2015-04-04 17:48:55 +0600
commitba9e68f40261355ceae5bb87c5707adc7f7beb2e (patch)
treee0c86bf0f93287c17fdabb817403fcb77041229f
parentae0dd4b2988efc6252121ca2824ca8b3a8a18fba (diff)
[utils] Drop trailing comma before closing brace
-rw-r--r--test/test_utils.py6
-rw-r--r--youtube_dl/utils.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py
index abaf1ab73..4e524aca3 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -470,6 +470,12 @@ class TestUtil(unittest.TestCase):
self.assertEqual(d['x'], 1)
self.assertEqual(d['y'], 'a')
+ on = js_to_json('["abc", "def",]')
+ self.assertEqual(json.loads(on), ['abc', 'def'])
+
+ on = js_to_json('{"abc": "def",}')
+ self.assertEqual(json.loads(on), {'abc': 'def'})
+
def test_clean_html(self):
self.assertEqual(clean_html('a:\nb'), 'a: b')
self.assertEqual(clean_html('a:\n "b"'), 'a: "b"')
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 90e0ed9ab..e1761265c 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -1577,7 +1577,7 @@ def js_to_json(code):
'(?:[^'\\]*(?:\\\\|\\['"nu]))*[^'\\]*'|
[a-zA-Z_][.a-zA-Z_0-9]*
''', fix_kv, code)
- res = re.sub(r',(\s*\])', lambda m: m.group(1), res)
+ res = re.sub(r',(\s*[\]}])', lambda m: m.group(1), res)
return res