]> jfr.im git - yt-dlp.git/blobdiff - yt_dlp/extractor/onet.py
[ie/matchtv] Fix extractor (#10190)
[yt-dlp.git] / yt_dlp / extractor / onet.py
index 95177a21311c969be2d90455f642a7e93df72f62..05e4d692adacbc6bf129df830f584e0a4d970f65 100644 (file)
@@ -1,17 +1,14 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
 import re
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
+    NO_DEFAULT,
     ExtractorError,
+    determine_ext,
     float_or_none,
     get_element_by_class,
     int_or_none,
     js_to_json,
-    NO_DEFAULT,
     parse_iso8601,
     remove_start,
     strip_or_none,
@@ -42,7 +39,7 @@ def _extract_from_id(self, video_id, webpage=None):
         error = response.get('error')
         if error:
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, error['message']), expected=True)
+                '{} said: {}'.format(self.IE_NAME, error['message']), expected=True)
 
         video = response['result'].get('0')
 
@@ -83,7 +80,6 @@ def _extract_from_id(self, video_id, webpage=None):
                                 'vbr': float_or_none(f.get('video_bitrate')),
                             })
                         formats.append(http_f)
-        self._sort_formats(formats)
 
         meta = video.get('meta', {})
 
@@ -186,7 +182,7 @@ def _real_extract(self, url):
             return self._extract_from_id(video_id, webpage)
 
         matches = re.findall(
-            r'<a[^>]+href=[\'"](%s[a-z]+/[0-9a-z-]+/[0-9a-z]+)' % self._URL_BASE_RE,
+            rf'<a[^>]+href=[\'"]({self._URL_BASE_RE}[a-z]+/[0-9a-z-]+/[0-9a-z]+)',
             webpage)
         entries = [
             self.url_result(video_link, OnetIE.ie_key())
@@ -260,4 +256,4 @@ def _real_extract(self, url):
             mvp_id = self._search_mvp_id(webpage)
 
         return self.url_result(
-            'onetmvp:%s' % mvp_id, OnetMVPIE.ie_key(), video_id=mvp_id)
+            f'onetmvp:{mvp_id}', OnetMVPIE.ie_key(), video_id=mvp_id)