projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7296 from jaimeMF/xml_attrib_unicode
[youtube-dl]
/
youtube_dl
/
extractor
/
generic.py
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index a8413503293399d40a95f63d16af06f052ff9f13..ee5419f51017a5f3a5ce01018eaaa65f4ab979ab 100644
(file)
--- 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 (
from .common import InfoExtractor
from .youtube import YoutubeIE
from ..compat import (
+ compat_etree_fromstring,
compat_urllib_parse_unquote,
compat_urllib_request,
compat_urlparse,
compat_urllib_parse_unquote,
compat_urllib_request,
compat_urlparse,
@@
-21,7
+22,6
@@
from ..utils import (
HEADRequest,
is_html,
orderedSet,
HEADRequest,
is_html,
orderedSet,
- parse_xml,
smuggle_url,
unescapeHTML,
unified_strdate,
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:
# 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):
if doc.tag == 'rss':
return self._extract_rss(url, video_id, doc)
elif re.match(r'^(?:{[^}]+})?smil$', doc.tag):