debian/control: Update list of extractors.

[youtubedl] / youtube_dl / extractor / francetv.py

diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
index 461dac8efba90ea09f4f1e585d93754c81bd0136..6e1971043b3853b9fe54e682473a61621c9989e2 100644 (file)
--- a/youtube_dl/extractor/francetv.py
+++ b/youtube_dl/extractor/francetv.py
@@ -1,6 +1,5 @@
 # encoding: utf-8
 import re
 # encoding: utf-8
 import re

-import xml.etree.ElementTree

 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor


@@ -11,11 +10,10 @@ from ..utils import (
 
 class FranceTVBaseInfoExtractor(InfoExtractor):
     def _extract_video(self, video_id):
 
 class FranceTVBaseInfoExtractor(InfoExtractor):
     def _extract_video(self, video_id):

-        xml_desc = self._download_webpage(
+        info = self._download_xml(

             'http://www.francetvinfo.fr/appftv/webservices/video/'
             'getInfosOeuvre.php?id-diffusion='
             + video_id, video_id, 'Downloading XML config')
             'http://www.francetvinfo.fr/appftv/webservices/video/'
             'getInfosOeuvre.php?id-diffusion='
             + video_id, video_id, 'Downloading XML config')

-        info = xml.etree.ElementTree.fromstring(xml_desc.encode('utf-8'))

 
         manifest_url = info.find('videos/video/url').text
         video_url = manifest_url.replace('manifest.f4m', 'index_2_av.m3u8')
 
         manifest_url = info.find('videos/video/url').text
         video_url = manifest_url.replace('manifest.f4m', 'index_2_av.m3u8')


@@ -103,7 +101,7 @@ class France2IE(FranceTVBaseInfoExtractor):
 
 
 class GenerationQuoiIE(InfoExtractor):
 
 
 class GenerationQuoiIE(InfoExtractor):

-    IE_NAME = u'http://generation-quoi.france2.fr'
+    IE_NAME = u'france2.fr:generation-quoi'

     _VALID_URL = r'https?://generation-quoi\.france2\.fr/portrait/(?P<name>.*)(\?|$)'
 
     _TEST = {
     _VALID_URL = r'https?://generation-quoi\.france2\.fr/portrait/(?P<name>.*)(\?|$)'
 
     _TEST = {