From 4f2c65218993e4a87cc1d22041ce9e36bd13c331 Mon Sep 17 00:00:00 2001 From: dirkf Date: Thu, 15 May 2025 13:14:22 +0100 Subject: [PATCH] Tweak regexes --- youtube_dl/extractor/francetv.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py index a1a19569a..d8b29280d 100644 --- a/youtube_dl/extractor/francetv.py +++ b/youtube_dl/extractor/francetv.py @@ -33,7 +33,8 @@ from ..utils import ( ) try: - callable(format_field) + if not callable(format_field): + raise NameError except NameError: from ..utils import IDENTITY, NO_DEFAULT, variadic @@ -324,7 +325,7 @@ class FranceTVIE(InfoExtractor): class FranceTVEmbedIE(FranceTVBaseIE): _VALID_URL = r'''(?x) - https?://embed\.francetv\.fr(?:/*\?.*?\b(?Pue)=|/) + https?://embed\.francetv\.fr(?:/?\?(?:.*&)?(?Pue)=|/) (?P[\da-f]{32})(?:(?(ue)&|/?[?#]).*)?$ ''' _TESTS = [{ @@ -372,7 +373,7 @@ class FranceTVEmbedIE(FranceTVBaseIE): class FranceTVSiteIE(FranceTVBaseIE): IE_NAME = 'francetv:site' - _VALID_URL = r'https?://(?:(?:www\.)?france\.tv|mobile\.france\.tv)/(?:[^/]+/)*(?P[^/]+)\.html' + _VALID_URL = r'https?://(?:(?:www|mobile)\.)?france\.tv)/(?:[^/]+/)*(?P[^/]+)\.html' _TESTS = [{ 'url': 'https://www.france.tv/france-2/13h15-le-dimanche/140921-les-mysteres-de-jesus.html',