From fd5a06560caab95c71a2e2e805efa8d0f3a696a0 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 5 Aug 2024 11:06:11 +0200
Subject: Merging upstream version 2024.07.01.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 yt_dlp/extractor/europa.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'yt_dlp/extractor/europa.py')

diff --git a/yt_dlp/extractor/europa.py b/yt_dlp/extractor/europa.py
index 0cf889a..aa8baf2 100644
--- a/yt_dlp/extractor/europa.py
+++ b/yt_dlp/extractor/europa.py
@@ -28,7 +28,7 @@ class EuropaIE(InfoExtractor):
             'duration': 34,
             'view_count': int,
             'formats': 'mincount:3',
-        }
+        },
     }, {
         'url': 'http://ec.europa.eu/avservices/video/player.cfm?sitelang=en&ref=I107786',
         'only_matching': True,
@@ -41,11 +41,11 @@ class EuropaIE(InfoExtractor):
         video_id = self._match_id(url)
 
         playlist = self._download_xml(
-            'http://ec.europa.eu/avservices/video/player/playlist.cfm?ID=%s' % video_id, video_id)
+            f'http://ec.europa.eu/avservices/video/player/playlist.cfm?ID={video_id}', video_id)
 
         def get_item(type_, preference):
             items = {}
-            for item in playlist.findall('./info/%s/item' % type_):
+            for item in playlist.findall(f'./info/{type_}/item'):
                 lang, label = xpath_text(item, 'lg', default=None), xpath_text(item, 'label', default=None)
                 if lang and label:
                     items[lang] = label.strip()
@@ -77,7 +77,7 @@ class EuropaIE(InfoExtractor):
                 'url': video_url,
                 'format_id': lang,
                 'format_note': xpath_text(file_, './lglabel'),
-                'language_preference': language_preference(lang)
+                'language_preference': language_preference(lang),
             })
 
         return {
@@ -88,7 +88,7 @@ class EuropaIE(InfoExtractor):
             'upload_date': upload_date,
             'duration': duration,
             'view_count': view_count,
-            'formats': formats
+            'formats': formats,
         }
 
 
@@ -109,7 +109,7 @@ class EuroParlWebstreamIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         # live webstream
         'url': 'https://multimedia.europarl.europa.eu/en/webstreaming/euroscola_20221115-1000-SPECIAL-EUROSCOLA',
@@ -121,7 +121,7 @@ class EuroParlWebstreamIE(InfoExtractor):
             'release_date': '20221115',
             'live_status': 'is_live',
         },
-        'skip': 'not live anymore'
+        'skip': 'not live anymore',
     }, {
         'url': 'https://multimedia.europarl.europa.eu/en/webstreaming/committee-on-culture-and-education_20230301-1130-COMMITTEE-CULT',
         'info_dict': {
@@ -131,7 +131,7 @@ class EuroParlWebstreamIE(InfoExtractor):
             'release_date': '20230301',
             'title': 'Committee on Culture and Education',
             'release_timestamp': 1677666641,
-        }
+        },
     }, {
         # live stream
         'url': 'https://multimedia.europarl.europa.eu/en/webstreaming/committee-on-environment-public-health-and-food-safety_20230524-0900-COMMITTEE-ENVI',
@@ -143,7 +143,7 @@ class EuroParlWebstreamIE(InfoExtractor):
             'release_timestamp': 1684911541,
             'live_status': 'is_live',
         },
-        'skip': 'Not live anymore'
+        'skip': 'Not live anymore',
     }, {
         'url': 'https://multimedia.europarl.europa.eu/en/webstreaming/20240320-1345-SPECIAL-PRESSER',
         'info_dict': {
@@ -153,7 +153,7 @@ class EuroParlWebstreamIE(InfoExtractor):
             'release_date': '20240320',
             'title': 'md5:7c6c814cac55dea5e2d87bf8d3db2234',
             'release_timestamp': 1710939767,
-        }
+        },
     }, {
         'url': 'https://multimedia.europarl.europa.eu/webstreaming/briefing-for-media-on-2024-european-elections_20240429-1000-SPECIAL-OTHER',
         'only_matching': True,
@@ -170,7 +170,7 @@ class EuroParlWebstreamIE(InfoExtractor):
             query={
                 'api-version': 1.0,
                 'tenantId': 'bae646ca-1fc8-4363-80ba-2c04f06b4968',
-                'externalReference': display_id
+                'externalReference': display_id,
             })
 
         formats, subtitles = [], {}
@@ -186,5 +186,5 @@ class EuroParlWebstreamIE(InfoExtractor):
             'formats': formats,
             'subtitles': subtitles,
             'release_timestamp': parse_iso8601(json_info.get('startDateTime')),
-            'is_live': traverse_obj(webpage_nextjs, ('mediaItem', 'mediaSubType')) == 'Live'
+            'is_live': traverse_obj(webpage_nextjs, ('mediaItem', 'mediaSubType')) == 'Live',
         }
-- 
cgit v1.2.3