Merge tag 'upstream/2014.02.17'

[youtubedl] / youtube_dl / extractor / d8.py

diff --git a/youtube_dl/extractor/d8.py b/youtube_dl/extractor/d8.py
index a56842b161229e985a25e4baedbb1d480b1160f4..6b26ff2e3dd39fca4f5c64722942e7b1cfea72ef 100644 (file)
--- a/youtube_dl/extractor/d8.py
+++ b/youtube_dl/extractor/d8.py
@@ -1,22 +1,25 @@
 # encoding: utf-8
+from __future__ import unicode_literals
+
 from .canalplus import CanalplusIE
 
 
 class D8IE(CanalplusIE):
     _VALID_URL = r'https?://www\.d8\.tv/.*?/(?P<path>.*)'
     _VIDEO_INFO_TEMPLATE = 'http://service.canal-plus.com/video/rest/getVideosLiees/d8/%s'
-    IE_NAME = u'd8.tv'
+    IE_NAME = 'd8.tv'
 
     _TEST = {
-        u'url': u'http://www.d8.tv/d8-docs-mags/pid6589-d8-campagne-intime.html',
-        u'file': u'966289.flv',
-        u'info_dict': {
-            u'title': u'Campagne intime - Documentaire exceptionnel',
-            u'description': u'md5:d2643b799fb190846ae09c61e59a859f',
-            u'upload_date': u'20131108',
+        'url': 'http://www.d8.tv/d8-docs-mags/pid6589-d8-campagne-intime.html',
+        'file': '966289.flv',
+        'info_dict': {
+            'title': 'Campagne intime - Documentaire exceptionnel',
+            'description': 'md5:d2643b799fb190846ae09c61e59a859f',
+            'upload_date': '20131108',
         },
-        u'params': {
+        'params': {
             # rtmp
-            u'skip_download': True,
+            'skip_download': True,
         },
+        'skip': 'videos get deleted after a while',
     }