[ie/matchtv] Fix extractor (#10190)

[yt-dlp.git] / yt_dlp / extractor / turner.py

diff --git a/yt_dlp/extractor/turner.py b/yt_dlp/extractor/turner.py
index fae8b51e76c8a50a70b7c3ddc24e805c23c22b4b..8b79a8ba9a902adf10233a60590b5b1872b0b517 100644 (file)
--- a/yt_dlp/extractor/turner.py
+++ b/yt_dlp/extractor/turner.py
@@ -1,19 +1,18 @@
 import re
 
 from .adobepass import AdobePassIE
-from ..compat import compat_str
 from ..utils import (
-    fix_xml_ampersands,
-    xpath_text,
-    int_or_none,
+    ExtractorError,
     determine_ext,
+    fix_xml_ampersands,
     float_or_none,
+    int_or_none,
     parse_duration,
-    xpath_attr,
-    update_url_query,
-    ExtractorError,
     strip_or_none,
+    update_url_query,
     url_or_none,
+    xpath_attr,
+    xpath_text,
 )
 
 
@@ -79,7 +78,7 @@ def _extract_cvp_info(self, data_src, video_id, path_data={}, ap_data={}, fatal=
             ext = determine_ext(video_url)
             if video_url.startswith('/mp4:protected/'):
                 continue
-                # TODO Correct extraction for these files
+                # TODO: Correct extraction for these files
                 # protected_path_data = path_data.get('protected')
                 # if not protected_path_data or not rtmp_src:
                 #     continue
@@ -160,7 +159,7 @@ def _extract_cvp_info(self, data_src, video_id, path_data={}, ap_data={}, fatal=
                         'height': int(mobj.group('height')),
                         'tbr': int_or_none(mobj.group('bitrate')),
                     })
-                elif isinstance(format_id, compat_str):
+                elif isinstance(format_id, str):
                     if format_id.isdigit():
                         f['tbr'] = int(format_id)
                     else:
@@ -174,7 +173,6 @@ def _extract_cvp_info(self, data_src, video_id, path_data={}, ap_data={}, fatal=
                             else:
                                 f['tbr'] = int(mobj.group(1))
                 formats.append(f)
-        self._sort_formats(formats)
 
         for source in video_data.findall('closedCaptions/source'):
             for track in source.findall('track'):
@@ -188,7 +186,7 @@ def _extract_cvp_info(self, data_src, video_id, path_data={}, ap_data={}, fatal=
                         'scc': 'scc',
                         'webvtt': 'vtt',
                         'smptett': 'tt',
-                    }.get(source.get('format'))
+                    }.get(source.get('format')),
                 })
 
         thumbnails.extend({
@@ -220,7 +218,7 @@ def _extract_cvp_info(self, data_src, video_id, path_data={}, ap_data={}, fatal=
     def _extract_ngtv_info(self, media_id, tokenizer_query, ap_data=None):
         is_live = ap_data.get('is_live')
         streams_data = self._download_json(
-            'http://medium.ngtv.io/media/%s/tv' % media_id,
+            f'http://medium.ngtv.io/media/{media_id}/tv',
             media_id)['media']['tv']
         duration = None
         chapters = []
@@ -249,7 +247,6 @@ def _extract_ngtv_info(self, media_id, tokenizer_query, ap_data=None):
                         'start_time': start_time,
                         'end_time': start_time + chapter_duration,
                     })
-        self._sort_formats(formats)
 
         return {
             'formats': formats,