From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Thu, 12 May 2016 11:56:58 +0000 (+0800)
Subject: [vevo] Delay the georestriction check to prevent false alerts
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=7e8ddca1bb10068356d1ec43cf66e7627b76fce7;p=youtube-dl

[vevo] Delay the georestriction check to prevent false alerts

Fixes #9408
---

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')