aboutsummaryrefslogtreecommitdiffstats
path: root/yt_dlp/extractor
diff options
context:
space:
mode:
Diffstat (limited to 'yt_dlp/extractor')
-rw-r--r--yt_dlp/extractor/common.py2
-rw-r--r--yt_dlp/extractor/lbry.py6
-rw-r--r--yt_dlp/extractor/netverse.py4
-rw-r--r--yt_dlp/extractor/ninenow.py2
-rw-r--r--yt_dlp/extractor/vk.py4
-rw-r--r--yt_dlp/extractor/wimbledon.py2
6 files changed, 10 insertions, 10 deletions
diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py
index b69ac1d65..7deab995c 100644
--- a/yt_dlp/extractor/common.py
+++ b/yt_dlp/extractor/common.py
@@ -729,7 +729,7 @@ class InfoExtractor:
except UnsupportedError:
raise
except ExtractorError as e:
- e.video_id = e.video_id or self.get_temp_id(url),
+ e.video_id = e.video_id or self.get_temp_id(url)
e.ie = e.ie or self.IE_NAME,
e.traceback = e.traceback or sys.exc_info()[2]
raise
diff --git a/yt_dlp/extractor/lbry.py b/yt_dlp/extractor/lbry.py
index 7dd3a4861..9a9f9256f 100644
--- a/yt_dlp/extractor/lbry.py
+++ b/yt_dlp/extractor/lbry.py
@@ -248,9 +248,9 @@ class LBRYIE(LBRYBaseIE):
# GET request to v3 API returns original video/audio file if available
direct_url = re.sub(r'/api/v\d+/', '/api/v3/', streaming_url)
- ext = urlhandle_detect_ext(self._request_webpage(
- direct_url, display_id, 'Checking for original quality', headers=headers))
- if ext != 'm3u8':
+ urlh = self._request_webpage(
+ direct_url, display_id, 'Checking for original quality', headers=headers, fatal=False)
+ if urlh and urlhandle_detect_ext(urlh) != 'm3u8':
formats.append({
'url': direct_url,
'format_id': 'original',
diff --git a/yt_dlp/extractor/netverse.py b/yt_dlp/extractor/netverse.py
index 398198a1b..ef53e15da 100644
--- a/yt_dlp/extractor/netverse.py
+++ b/yt_dlp/extractor/netverse.py
@@ -160,7 +160,7 @@ class NetverseIE(NetverseBaseIE):
'uploader': 'Net Prime',
'comment_count': int,
},
- 'params':{
+ 'params': {
'getcomments': True
}
}, {
@@ -187,7 +187,7 @@ class NetverseIE(NetverseBaseIE):
'season': 'Season 1',
'comment_count': int,
},
- 'params':{
+ 'params': {
'getcomments': True
}
}]
diff --git a/yt_dlp/extractor/ninenow.py b/yt_dlp/extractor/ninenow.py
index b970f8ccb..c655b75f4 100644
--- a/yt_dlp/extractor/ninenow.py
+++ b/yt_dlp/extractor/ninenow.py
@@ -53,7 +53,7 @@ class NineNowIE(InfoExtractor):
'upload_date': '20210421',
},
'expected_warnings': ['Ignoring subtitle tracks'],
- 'params':{
+ 'params': {
'skip_download': True,
}
}]
diff --git a/yt_dlp/extractor/vk.py b/yt_dlp/extractor/vk.py
index 6b7379d46..915422817 100644
--- a/yt_dlp/extractor/vk.py
+++ b/yt_dlp/extractor/vk.py
@@ -765,7 +765,7 @@ class VKPlayBaseIE(InfoExtractor):
class VKPlayIE(VKPlayBaseIE):
- _VALID_URL = r'https?://vkplay\.live/(?P<username>[^/]+)/record/(?P<id>[a-f0-9\-]+)'
+ _VALID_URL = r'https?://vkplay\.live/(?P<username>[^/#?]+)/record/(?P<id>[a-f0-9-]+)'
_TESTS = [{
'url': 'https://vkplay.live/zitsmann/record/f5e6e3b5-dc52-4d14-965d-0680dd2882da',
'info_dict': {
@@ -802,7 +802,7 @@ class VKPlayIE(VKPlayBaseIE):
class VKPlayLiveIE(VKPlayBaseIE):
- _VALID_URL = r'https?://vkplay\.live/(?P<id>[^/]+)/?(?:[#?]|$)'
+ _VALID_URL = r'https?://vkplay\.live/(?P<id>[^/#?]+)/?(?:[#?]|$)'
_TESTS = [{
'url': 'https://vkplay.live/bayda',
'info_dict': {
diff --git a/yt_dlp/extractor/wimbledon.py b/yt_dlp/extractor/wimbledon.py
index ee4872e88..0223e54f1 100644
--- a/yt_dlp/extractor/wimbledon.py
+++ b/yt_dlp/extractor/wimbledon.py
@@ -6,7 +6,7 @@ from ..utils import (
class WimbledonIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?wimbledon\.com/\w+/video/media/(?P<id>\d+).html'
+ _VALID_URL = r'https?://(?:www\.)?wimbledon\.com/\w+/video/media/(?P<id>\d+)\.html'
_TESTS = [{
'url': 'https://www.wimbledon.com/en_GB/video/media/6330247525112.html',
'info_dict': {