From 51bf4bd67805dc1ed81ceda1cb8aff730bffdce3 Mon Sep 17 00:00:00 2001 From: Joseph Spiros Date: Sat, 24 Mar 2018 10:03:27 -0400 Subject: [PATCH] [kaltura] condense two similar extraction regular expressions into one --- youtube_dl/extractor/kaltura.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py index c788760a2..5c4d797c3 100644 --- a/youtube_dl/extractor/kaltura.py +++ b/youtube_dl/extractor/kaltura.py @@ -117,18 +117,9 @@ class KalturaIE(InfoExtractor): (?P['"])wid(?P=q1)\s*:\s* (?P['"])_?(?P(?:(?!(?P=q2)).)+)(?P=q2),.*? (?P['"])entry_?[Ii]d(?P=q3)\s*:\s* - (?P['"])(?P(?:(?!(?P=q4)).)+)(?P=q4),.*? + (?P['"])(?P(?:(?!(?P=q4)).)+)(?P=q4)(?:,.*? (?P['"])ks(?P=q5)\s*:\s* - (?P['"])(?P(?:(?!(?P=q6)).)+)(?P=q6)(?:,|\s*\}) - """, webpage) or - re.search( - r"""(?xs) - kWidget\.(?:thumb)?[Ee]mbed\( - \{.*? - (?P['"])wid(?P=q1)\s*:\s* - (?P['"])_?(?P(?:(?!(?P=q2)).)+)(?P=q2),.*? - (?P['"])entry_?[Ii]d(?P=q3)\s*:\s* - (?P['"])(?P(?:(?!(?P=q4)).)+)(?P=q4)(?:,|\s*\}) + (?P['"])(?P(?:(?!(?P=q6)).)+)(?P=q6))?(?:,|\s*\}) """, webpage) or re.search( r'''(?xs)