New upstream version 2017.02.07

[youtubedl] / youtube_dl / extractor / eitb.py

diff --git a/youtube_dl/extractor/eitb.py b/youtube_dl/extractor/eitb.py
index 357a2196c5932833f4ed5350d17ee3216719a6b2..ee5ead18b0834b7c2e27258b4fc6950fa93ad960 100644 (file)
--- a/youtube_dl/extractor/eitb.py
+++ b/youtube_dl/extractor/eitb.py
@@ -1,12 +1,12 @@
-# encoding: utf-8
+# coding: utf-8

 from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 from .common import InfoExtractor

-from ..compat import compat_urllib_request

 from ..utils import (
     float_or_none,
     int_or_none,
     parse_iso8601,
 from ..utils import (
     float_or_none,
     int_or_none,
     parse_iso8601,

+    sanitized_Request,

 )
 
 
 )
 
 


@@ -57,7 +57,7 @@ class EitbIE(InfoExtractor):
 
         hls_url = media.get('HLS_SURL')
         if hls_url:
 
         hls_url = media.get('HLS_SURL')
         if hls_url:

-            request = compat_urllib_request.Request(
+            request = sanitized_Request(

                 'http://mam.eitb.eus/mam/REST/ServiceMultiweb/DomainRestrictedSecurity/TokenAuth/',
                 headers={'Referer': url})
             token_data = self._download_json(
                 'http://mam.eitb.eus/mam/REST/ServiceMultiweb/DomainRestrictedSecurity/TokenAuth/',
                 headers={'Referer': url})
             token_data = self._download_json(


@@ -65,18 +65,14 @@ class EitbIE(InfoExtractor):
             if token_data:
                 token = token_data.get('token')
                 if token:
             if token_data:
                 token = token_data.get('token')
                 if token:

-                    m3u8_formats = self._extract_m3u8_formats(
-                        '%s?hdnts=%s' % (hls_url, token), video_id, m3u8_id='hls', fatal=False)
-                    if m3u8_formats:
-                        formats.extend(m3u8_formats)
+                    formats.extend(self._extract_m3u8_formats(
+                        '%s?hdnts=%s' % (hls_url, token), video_id, m3u8_id='hls', fatal=False))

 
         hds_url = media.get('HDS_SURL')
         if hds_url:
 
         hds_url = media.get('HDS_SURL')
         if hds_url:

-            f4m_formats = self._extract_f4m_formats(
+            formats.extend(self._extract_f4m_formats(

                 '%s?hdcore=3.7.0' % hds_url.replace('euskalsvod', 'euskalvod'),
                 '%s?hdcore=3.7.0' % hds_url.replace('euskalsvod', 'euskalvod'),

-                video_id, f4m_id='hds', fatal=False)
-            if f4m_formats:
-                formats.extend(f4m_formats)
+                video_id, f4m_id='hds', fatal=False))

 
         self._sort_formats(formats)
 
 
         self._sort_formats(formats)