[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 b0d8604526abc29b4b0a09eb59068561f17312a8..aabde15f3ff2acf09d5746b749388d5f29eb1d74 100644 (file)
--- 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)