From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 4 Apr 2015 11:48:55 +0000 (+0600)
Subject: [utils] Drop trailing comma before closing brace
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=ba9e68f40261355ceae5bb87c5707adc7f7beb2e;p=youtube-dl

[utils] Drop trailing comma before closing brace
---

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