Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[compat] compat_etree_fromstring: also decode the text attribute

Browse source 
Deletes parse_xml from utils, because it also does it.
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-10-26 16:41:24 +01:00
parent 387db16a78
commit f78546272c
5 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/extractor/ard.py
View file

@ -14,8 +14,8 @@ from ..utils import (
parse_duration,
unified_strdate,
xpath_text,
parse_xml,
)
from ..compat import compat_etree_fromstring
class ARDMediathekIE(InfoExtractor):
@ -161,7 +161,7 @@ class ARDMediathekIE(InfoExtractor):
raise ExtractorError('This program is only suitable for those aged 12 and older. Video %s is therefore only available between 20 pm and 6 am.' % video_id, expected=True)
if re.search(r'[\?&]rss($|[=&])', url):
doc = parse_xml(webpage)
doc = compat_etree_fromstring(webpage.encode('utf-8'))
if doc.tag == 'rss':
return GenericIE()._extract_rss(url, video_id, doc)