diff options
| author | Sergey M <dstftw@gmail.com> | 2015-10-31 18:15:21 +0000 |
|---|---|---|
| committer | Sergey M <dstftw@gmail.com> | 2015-10-31 18:15:21 +0000 |
| commit | 30eecc6a044d4070d0e8ea4a6e0637867f0d3a28 (patch) | |
| tree | c120cc9df90a468bb0d58bb7a7601cb8418eb32f /youtube_dl/extractor/generic.py | |
| parent | dbd82a1d4fff1655920e111cc25a7fd526d7bf9a (diff) | |
| parent | ae37338e681319a28d98dc551253d9fa1830969a (diff) | |
Merge pull request #7296 from jaimeMF/xml_attrib_unicode
Use a wrapper around xml.etree.ElementTree.fromstring in python 2.x (…
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index a84135032..ee5419f51 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -9,6 +9,7 @@ import sys from .common import InfoExtractor from .youtube import YoutubeIE from ..compat import ( + compat_etree_fromstring, compat_urllib_parse_unquote, compat_urllib_request, compat_urlparse, @@ -21,7 +22,6 @@ from ..utils import ( HEADRequest, is_html, orderedSet, - parse_xml, smuggle_url, unescapeHTML, unified_strdate, @@ -1238,7 +1238,7 @@ class GenericIE(InfoExtractor): # Is it an RSS feed, a SMIL file or a XSPF playlist? try: - doc = parse_xml(webpage) + doc = compat_etree_fromstring(webpage.encode('utf-8')) if doc.tag == 'rss': return self._extract_rss(url, video_id, doc) elif re.match(r'^(?:{[^}]+})?smil$', doc.tag): |