From e6e9e1f45bc28c597ec43591fbb5bbd25b668720 Mon Sep 17 00:00:00 2001 From: sulyi Date: Mon, 21 Nov 2016 11:39:53 +0100 Subject: [PATCH] [utils] Fixing runaway comments in js_to_json --- youtube_dl/utils.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index bda59e627..bcea188a3 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -2109,14 +2109,11 @@ def js_to_json(code): return '"%s"' % v - # fixing , followed nothing, but comments - # fixing unnecessary ? in /\*.*?\*/ - # fixing greedy comment return re.sub(r'''(?sx) "(?:[^"\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^"\\]*"| '(?:[^'\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^'\\]*'| - ,(?=(\s|(/\*((?!\*/)\n|.)*\*/))*[\]}])| - /\*((?!\*/)\n|.)*\*/|[a-zA-Z_][.a-zA-Z_0-9]*| + ,(?=(\s|(/\*((?!\*/)(\n|.))*\*/))*[\]}])| + /\*((?!\*/)(\n|.))*\*/|[a-zA-Z_][.a-zA-Z_0-9]*| \b(?:0[xX][0-9a-fA-F]+|0+[0-7]+)(?:\s*:)?| [0-9]+(?=\s*:) ''', fix_kv, code)