Merge tag 'upstream/2013.11.11'

[youtubedl] / youtube_dl / extractor / faz.py

diff --git a/youtube_dl/extractor/faz.py b/youtube_dl/extractor/faz.py
index deaa4ed2d9bc14406b6a7d3d6e8b015c6fcf915d..89ed08db4cbb99f9381013813fa03a19474c8e24 100644 (file)
--- a/youtube_dl/extractor/faz.py
+++ b/youtube_dl/extractor/faz.py
@@ -5,8 +5,6 @@ import xml.etree.ElementTree
 from .common import InfoExtractor
 from ..utils import (
     determine_ext,
 from .common import InfoExtractor
 from ..utils import (
     determine_ext,

-    clean_html,
-    get_element_by_attribute,

 )
 
 
 )
 
 


@@ -47,12 +45,12 @@ class FazIE(InfoExtractor):
                 'format_id': code.lower(),
             })
 
                 'format_id': code.lower(),
             })
 

-        descr_html = get_element_by_attribute('class', 'Content Copy', webpage)
+        descr = self._html_search_regex(r'<p class="Content Copy">(.*?)</p>', webpage, u'description')

         info = {
             'id': video_id,
             'title': self._og_search_title(webpage),
             'formats': formats,
         info = {
             'id': video_id,
             'title': self._og_search_title(webpage),
             'formats': formats,

-            'description': clean_html(descr_html),
+            'description': descr,

             'thumbnail': config.find('STILL/STILL_BIG').text,
         }
         # TODO: Remove when #980 has been merged
             'thumbnail': config.find('STILL/STILL_BIG').text,
         }
         # TODO: Remove when #980 has been merged