aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-02-04 18:55:39 +0700
committerSergey M <dstftw@gmail.com>2017-02-19 05:10:08 +0800
commit5d3fbf77d96ade64c645b6942979c0b99aa4d775 (patch)
tree7a68279ee1d9ebb3e94841b6adb4b1a0c6e75adc
parent80b59020e02e9c61f74f8f8f8891f9745667edb7 (diff)
downloadyoutube-dl-5d3fbf77d96ade64c645b6942979c0b99aa4d775.tar.xz
[viki] Improve geo restriction detection
-rw-r--r--youtube_dl/extractor/viki.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/extractor/viki.py b/youtube_dl/extractor/viki.py
index 9c48701c1..68a74e246 100644
--- a/youtube_dl/extractor/viki.py
+++ b/youtube_dl/extractor/viki.py
@@ -27,6 +27,7 @@ class VikiBaseIE(InfoExtractor):
_APP_VERSION = '2.2.5.1428709186'
_APP_SECRET = '-$iJ}@p7!G@SyU/je1bEyWg}upLu-6V6-Lg9VD(]siH,r.,m-r|ulZ,U4LC/SeR)'
+ _BYPASS_GEO = False
_NETRC_MACHINE = 'viki'
_token = None
@@ -77,8 +78,11 @@ class VikiBaseIE(InfoExtractor):
def _check_errors(self, data):
for reason, status in data.get('blocking', {}).items():
if status and reason in self._ERRORS:
+ message = self._ERRORS[reason]
+ if reason == 'geo':
+ self.raise_geo_restricted(msg=message)
raise ExtractorError('%s said: %s' % (
- self.IE_NAME, self._ERRORS[reason]), expected=True)
+ self.IE_NAME, message), expected=True)
def _real_initialize(self):
self._login()