X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fnrk.py;h=c89aac63ee90f133074d8ade8b7af23cf020f148;hb=50913b82414488bbf625a00f1844ca84dec094dd;hp=aed98141be2365aeca164649a829a0efa72b6b01;hpb=754e6c8322705cd9953c5f1032ed9dae35c38b27;p=youtube-dl

diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py
index aed98141b..c89aac63e 100644
--- a/youtube_dl/extractor/nrk.py
+++ b/youtube_dl/extractor/nrk.py
@@ -17,14 +17,15 @@ from ..utils import (
 class NRKBaseIE(InfoExtractor):
     _faked_ip = None
 
-    def _download_webpage(self, *args, **kwargs):
+    def _download_webpage_handle(self, *args, **kwargs):
         # NRK checks X-Forwarded-For HTTP header in order to figure out the
         # origin of the client behind proxy. This allows to bypass geo
         # restriction by faking this header's value to some Norway IP.
         # We will do so once we encounter any geo restriction error.
         if self._faked_ip:
-            kwargs.setdefault('headers', {})['X-Forwarded-For'] = self._faked_ip
-        return super(NRKBaseIE, self)._download_webpage(*args, **kwargs)
+            # NB: str is intentional
+            kwargs.setdefault(str('headers'), {})['X-Forwarded-For'] = self._faked_ip
+        return super(NRKBaseIE, self)._download_webpage_handle(*args, **kwargs)
 
     def _fake_ip(self):
         # Use fake IP from 37.191.128.0/17 in order to workaround geo
@@ -43,6 +44,8 @@ class NRKBaseIE(InfoExtractor):
         title = data.get('fullTitle') or data.get('mainTitle') or data['title']
         video_id = data.get('id') or video_id
 
+        http_headers = {'X-Forwarded-For': self._faked_ip} if self._faked_ip else {}
+
         entries = []
 
         media_assets = data.get('mediaAssets')
@@ -73,6 +76,7 @@ class NRKBaseIE(InfoExtractor):
                     'duration': duration,
                     'subtitles': subtitles,
                     'formats': formats,
+                    'http_headers': http_headers,
                 })
 
         if not entries:
@@ -89,8 +93,9 @@ class NRKBaseIE(InfoExtractor):
                 }]
 
         if not entries:
-            message_type = data.get('messageType')
-            if message_type == 'ProgramIsGeoBlocked' and not self._faked_ip:
+            message_type = data.get('messageType', '')
+            # Can be ProgramIsGeoBlocked or ChannelIsGeoBlocked*
+            if 'IsGeoBlocked' in message_type and not self._faked_ip:
                 self.report_warning(
                     'Video is geo restricted, trying to fake IP')
                 self._fake_ip()