Merge pull request #5985 from zx8/master

[youtube-dl] / youtube_dl / extractor / francetv.py

diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
index fd3e7aa7b50035f02fd463c5629bfe859c20ec8b..db0bbec1ec1338e3aeaaa26af19cc0612372995f 100644 (file)
--- a/youtube_dl/extractor/francetv.py
+++ b/youtube_dl/extractor/francetv.py
@@ -60,7 +60,7 @@ class FranceTVBaseInfoExtractor(InfoExtractor):
                     continue
                 video_url_parsed = compat_urllib_parse_urlparse(video_url)
                 f4m_url = self._download_webpage(
-                    'http://hdfauth.francetv.fr/esi/urltokengen2.html?url=%s' % video_url_parsed.path,
+                    'http://hdfauth.francetv.fr/esi/TA?url=%s' % video_url_parsed.path,
                     video_id, 'Downloading f4m manifest token', fatal=False)
                 if f4m_url:
                     formats.extend(self._extract_f4m_formats(f4m_url, video_id, 1, format_id))
@@ -261,18 +261,16 @@ class CultureboxIE(FranceTVBaseInfoExtractor):
 
     _TEST = {
         'url': 'http://culturebox.francetvinfo.fr/live/musique/musique-classique/le-livre-vermeil-de-montserrat-a-la-cathedrale-delne-214511',
+        'md5': '9b88dc156781c4dbebd4c3e066e0b1d6',
         'info_dict': {
             'id': 'EV_50111',
-            'ext': 'mp4',
+            'ext': 'flv',
             'title': "Le Livre Vermeil de Montserrat à la Cathédrale d'Elne",
             'description': 'md5:f8a4ad202e8fe533e2c493cc12e739d9',
             'upload_date': '20150320',
             'timestamp': 1426892400,
             'duration': 2760.9,
         },
-        'params': {
-            'skip_download': True,
-        },
     }
 
     def _real_extract(self, url):