From bb87bafce6e6f49dae3ec49fe01a72320d46c9b2 Mon Sep 17 00:00:00 2001 From: Kyle Gonsalves Date: Wed, 24 Apr 2024 15:30:42 -0700 Subject: [PATCH] Revert to use merge_dicts and fix flake This reverts commit b0593ecfa4ab2ca785ac66d29de873b0d2f74a9d. --- yt_dlp/extractor/bbc.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/yt_dlp/extractor/bbc.py b/yt_dlp/extractor/bbc.py index 42cc07b46..1addae237 100644 --- a/yt_dlp/extractor/bbc.py +++ b/yt_dlp/extractor/bbc.py @@ -17,6 +17,7 @@ from ..utils import ( int_or_none, join_nonempty, js_to_json, + merge_dicts, parse_duration, parse_iso8601, parse_qs, @@ -1397,23 +1398,20 @@ class BBCIE(BBCCoUkIE): # XXX: Do not subclass from concrete IE 'tbr': ('bitrate', {k_int_or_none}), }, {lambda u: u.get('url') and u})) if formats: - entry = { + entry = merge_dicts({ 'id': block_id, 'display_id': playlist_id, 'formats': formats, - **traverse_obj(simorgh_data, ( - 'pageData', 'promo', { - 'description': ('summary', {str}), - } - )), - **traverse_obj(model, { - 'title': ('title', {str}), - 'thumbnail': ('imageUrl', {lambda u: urljoin(url, u.replace('$recipe', 'raw'))}), - 'description': ( - 'synopses', ('long', 'medium', 'short'), {str}, any), - 'timestamp': ('firstPublished', {k_int_or_none}), - }), - } + }, traverse_obj(simorgh_data, ('pageData', 'promo', { + 'description': ('summary', {str}), + })), traverse_obj(model, { + 'title': ('title', {str}), + 'thumbnail': ('imageUrl', {lambda u: urljoin(url, u.replace('$recipe', 'raw'))}), + 'description': ( + 'synopses', ('long', 'medium', 'short'), {str}, any), + 'timestamp': ('firstPublished', {k_int_or_none}), + }), + ) done = True if entry: entries.append(entry)