aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-02-04 18:51:51 +0700
committerSergey M <dstftw@gmail.com>2017-02-19 05:10:08 +0800
commit28200e654b8051cadca12e51bd57f77e1ff0a4ed (patch)
treec3d3321f6caa31ea1a689b840eae6d694a6df3d5
parente633f21a96f37a96e8ef0fd4d6c1e4d3c0b41fbf (diff)
[itv] Improve geo restriction detection and use geo bypass mechanism
-rw-r--r--youtube_dl/extractor/itv.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/youtube_dl/extractor/itv.py b/youtube_dl/extractor/itv.py
index b0d860452..aabde15f3 100644
--- 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)