From: Sergey M․ Date: Sat, 4 Feb 2017 11:51:51 +0000 (+0700) Subject: [itv] Improve geo restriction detection and use geo bypass mechanism X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=28200e654b8051cadca12e51bd57f77e1ff0a4ed;p=youtube-dl [itv] Improve geo restriction detection and use geo bypass mechanism --- 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)