From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 24 Nov 2013 14:28:33 +0000 (+0100)
Subject: [viki] Skip travis test
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=6d88bc37a32d5d624c09d68cd19e64e6095fa5de;p=youtube-dl

[viki] Skip travis test

Also provide a better error message for geoblocked videos.
---

diff --git a/youtube_dl/extractor/viki.py b/youtube_dl/extractor/viki.py
index 8088dcf0b..7b3a58de8 100644
--- a/youtube_dl/extractor/viki.py
+++ b/youtube_dl/extractor/viki.py
@@ -1,6 +1,7 @@
 import re
 
 from ..utils import (
+    ExtractorError,
     unified_strdate,
 )
 from .subtitles import SubtitlesInfoExtractor
@@ -20,7 +21,8 @@ class VikiIE(SubtitlesInfoExtractor):
             u'description': u'md5:c4b17b9626dd4b143dcc4d855ba3474e',
             u'upload_date': u'20131121',
             u'age_limit': 13,
-        }
+        },
+        u'skip': u'Blocked in the US',
     }
 
     def _real_extract(self, url):
@@ -53,6 +55,10 @@ class VikiIE(SubtitlesInfoExtractor):
         info_url = 'http://www.viki.com/player5_fragment/%s?action=show&controller=videos' % video_id
         info_webpage = self._download_webpage(
             info_url, video_id, note=u'Downloading info page')
+        if re.match(r'\s*<div\s+class="video-error', info_webpage):
+            raise ExtractorError(
+                u'Video %s is blocked from your location.' % video_id,
+                expected=True)
         video_url = self._html_search_regex(
             r'<source[^>]+src="([^"]+)"', info_webpage, u'video URL')