aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/vevo.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-05-12 19:56:58 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-05-12 19:56:58 +0800
commit7e8ddca1bb10068356d1ec43cf66e7627b76fce7 (patch)
tree3f8270322416037a3f36ec8c69babdee1799f625 /youtube_dl/extractor/vevo.py
parent778a1ccca7d6cce06faf17867f20b87883d84e98 (diff)
[vevo] Delay the georestriction check to prevent false alerts
Fixes #9408
Diffstat (limited to 'youtube_dl/extractor/vevo.py')
-rw-r--r--youtube_dl/extractor/vevo.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py
index c0632cd6a..388b4debe 100644
--- a/youtube_dl/extractor/vevo.py
+++ b/youtube_dl/extractor/vevo.py
@@ -213,19 +213,17 @@ class VevoIE(VevoBaseIE):
formats = []
if not video_info:
- if response and response.get('statusCode') != 909:
+ try:
+ self._initialize_api(video_id)
+ except ExtractorError:
ytid = response.get('errorInfo', {}).get('ytid')
if ytid:
self.report_warning(
'Video is geoblocked, trying with the YouTube video %s' % ytid)
return self.url_result(ytid, 'Youtube', ytid)
- if 'statusMessage' in response:
- raise ExtractorError('%s said: %s' % (
- self.IE_NAME, response['statusMessage']), expected=True)
- raise ExtractorError('Unable to extract videos')
+ raise
- self._initialize_api(video_id)
video_info = self._call_api(
'video/%s' % video_id, video_id, 'Downloading api video info',
'Failed to download video info')