From 8842f08df3daaac213124ae0c259ae12f3919f60 Mon Sep 17 00:00:00 2001 From: sulyi Date: Sat, 26 Nov 2016 01:13:44 +0100 Subject: [PATCH] [jsinterp] String literal regex change --- youtube_dl/jsinterp.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py index 35d2c535f..4c498bdc4 100644 --- a/youtube_dl/jsinterp.py +++ b/youtube_dl/jsinterp.py @@ -34,8 +34,8 @@ _ASSIGN_OPERATORS_RE = r'|'.join(re.escape(op) for op, opfunc in _ASSIGN_OPERATO _NAME_RE = r'[a-zA-Z_$][a-zA-Z_$0-9]*' -_SINGLE_QUOTED = r"""'(?:[^'\\\\]*(?:\\\\\\\\|\\\\['"nurtbfx/\\n]))*[^'\\\\]*'""" -_DOUBLE_QUOTED = r'''"(?:[^"\\\\]*(?:\\\\\\\\|\\\\['"nurtbfx/\\n]))*[^"\\\\]*"''' +_SINGLE_QUOTED = r"""'(?:[^'\\]|\\['"nurtbfx/\\n])*'""" +_DOUBLE_QUOTED = r'''"(?:[^"\\]|\\['"nurtbfx/\\n])*"''' _STRING_RE = r'%s|%s' % (_SINGLE_QUOTED, _DOUBLE_QUOTED) _INTEGER_RE = r'%(hex)s|%(dec)s|%(oct)s' % {'hex': __HEXADECIMAL_RE, 'dec': __DECIMAL_RE, 'oct': __OCTAL_RE} @@ -56,8 +56,6 @@ _LITERAL_RE = r'((?P%(int)s)|(?P%(float)s)|(?P%(str)s)|(?P