commit 28200e654b8051cadca12e51bd57f77e1ff0a4ed
parent e633f21a96f37a96e8ef0fd4d6c1e4d3c0b41fbf
Author: Sergey M․ <dstftw@gmail.com>
Date: Sat, 4 Feb 2017 18:51:51 +0700
[itv] Improve geo restriction detection and use geo bypass mechanism
Diffstat:
1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/youtube_dl/extractor/itv.py b/youtube_dl/extractor/itv.py
@@ -98,7 +98,10 @@ class ITVIE(InfoExtractor):
headers=headers, data=etree.tostring(req_env))
playlist = xpath_element(resp_env, './/Playlist')
if playlist is None:
+ fault_code = xpath_text(resp_env, './/faultcode')
fault_string = xpath_text(resp_env, './/faultstring')
+ if fault_code == 'InvalidGeoRegion':
+ self.raise_geo_restricted(msg=fault_string, countries=['GB'])
raise ExtractorError('%s said: %s' % (self.IE_NAME, fault_string))
title = xpath_text(playlist, 'EpisodeTitle', fatal=True)
video_element = xpath_element(playlist, 'VideoEntries/Video', fatal=True)