X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fdefense.py;h=5e50c63d9aca7d2642239ccf32a5cedd91b05174;hb=ae6986fb895ceb72e084b587bc9d070c86848347;hp=963fb897f407f5b266d98343fe8f0b3b6b0ba189;hpb=52afe996656987ad17999212d8a25e12151147a7;p=youtube-dl

diff --git a/youtube_dl/extractor/defense.py b/youtube_dl/extractor/defense.py
index 963fb897f..5e50c63d9 100644
--- a/youtube_dl/extractor/defense.py
+++ b/youtube_dl/extractor/defense.py
@@ -1,5 +1,5 @@
-# coding: utf-8
-'''Extractor for defense.gouv.fr'''
+from __future__ import unicode_literals
+
 import re
 import json
 
@@ -7,14 +7,17 @@ from .common import InfoExtractor
 
 
 class DefenseGouvFrIE(InfoExtractor):
-    '''Extractor for defense.gouv.fr'''
-    _IE_NAME = 'defense.gouv.fr'
+    IE_NAME = 'defense.gouv.fr'
     _VALID_URL = (r'http://.*?\.defense\.gouv\.fr/layout/set/'
-        'ligthboxvideo/base-de-medias/webtv/(.*)')
+                  r'ligthboxvideo/base-de-medias/webtv/(.*)')
 
     _TEST = {
-        u'url': (u'http://www.defense.gouv.fr/layout/set/ligthboxvideo/',
-        'base-de-medias/webtv/attaque-chimique-syrienne-du-21-aout-2013-1')
+        'url': 'http://www.defense.gouv.fr/layout/set/ligthboxvideo/base-de-medias/webtv/attaque-chimique-syrienne-du-21-aout-2013-1',
+        'file': '11213.mp4',
+        'md5': '75bba6124da7e63d2d60b5244ec9430c',
+        "info_dict": {
+            "title": "attaque-chimique-syrienne-du-21-aout-2013-1"
+        }
     }
 
     def _real_extract(self, url):
@@ -23,13 +26,13 @@ class DefenseGouvFrIE(InfoExtractor):
         video_id = self._search_regex(
             r"flashvars.pvg_id=\"(\d+)\";",
             webpage, 'ID')
-        
+
         json_url = ('http://static.videos.gouv.fr/brightcovehub/export/json/'
-            + video_id)
+                    + video_id)
         info = self._download_webpage(json_url, title,
-                                                  'Downloading JSON config')
+                                      'Downloading JSON config')
         video_url = json.loads(info)['renditions'][0]['url']
-        
+
         return {'id': video_id,
                 'ext': 'mp4',
                 'url': video_url,