Imported Upstream version 2014.01.17.2

[youtubedl] / youtube_dl / extractor / tf1.py

diff --git a/youtube_dl/extractor/tf1.py b/youtube_dl/extractor/tf1.py
index e0ffeced50eabae1a9f7d0a9920e1df18c5fa4c6..2c5c88be8ede5ae6d0fa9f3c4e540cddb13190b6 100644 (file)
--- a/youtube_dl/extractor/tf1.py
+++ b/youtube_dl/extractor/tf1.py
@@ -6,19 +6,17 @@ import re
 from .common import InfoExtractor
 
 class TF1IE(InfoExtractor):
 from .common import InfoExtractor
 
 class TF1IE(InfoExtractor):

-    """
-    TF1 uses the wat.tv player, currently it can only download videos with the
-    html5 player enabled, it cannot download HD videos.
-    """
-    _VALID_URL = r'http://videos.tf1.fr/.*-(.*?).html'
+    """TF1 uses the wat.tv player."""
+    _VALID_URL = r'http://videos\.tf1\.fr/.*-(.*?)\.html'

     _TEST = {
         u'url': u'http://videos.tf1.fr/auto-moto/citroen-grand-c4-picasso-2013-presentation-officielle-8062060.html',
         u'file': u'10635995.mp4',
     _TEST = {
         u'url': u'http://videos.tf1.fr/auto-moto/citroen-grand-c4-picasso-2013-presentation-officielle-8062060.html',
         u'file': u'10635995.mp4',

-        u'md5': u'66789d3e91278d332f75e1feb7aea327',
+        u'md5': u'2e378cc28b9957607d5e88f274e637d8',

         u'info_dict': {
             u'title': u'Citroën Grand C4 Picasso 2013 : présentation officielle',
             u'description': u'Vidéo officielle du nouveau Citroën Grand C4 Picasso, lancé à l\'automne 2013.',
         u'info_dict': {
             u'title': u'Citroën Grand C4 Picasso 2013 : présentation officielle',
             u'description': u'Vidéo officielle du nouveau Citroën Grand C4 Picasso, lancé à l\'automne 2013.',

-        }
+        },
+        u'skip': u'Sometimes wat serves the whole file with the --test option',

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):