Browse Source

[utils] Drop trailing comma before closing brace

totalwebcasting
Sergey M․ 10 years ago
parent
commit
ba9e68f402
2 changed files with 7 additions and 1 deletions
  1. +6
    -0
      test/test_utils.py
  2. +1
    -1
      youtube_dl/utils.py

+ 6
- 0
test/test_utils.py View File

@ -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"')


+ 1
- 1
youtube_dl/utils.py View File

@ -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


Loading…
Cancel
Save