projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a wrapper around xml.etree.ElementTree.fromstring in python 2.x (#7178)
[youtube-dl]
/
youtube_dl
/
extractor
/
common.py
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 10c0d5d1f91f49846176d28a0edfb8f3cfa61801..52523d7b249210eed88d334c2fefe28cabe78706 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-10,7
+10,6
@@
import re
import socket
import sys
import time
import socket
import sys
import time
-import xml.etree.ElementTree
from ..compat import (
compat_cookiejar,
from ..compat import (
compat_cookiejar,
@@
-23,6
+22,7
@@
from ..compat import (
compat_urllib_request,
compat_urlparse,
compat_str,
compat_urllib_request,
compat_urlparse,
compat_str,
+ compat_etree_fromstring,
)
from ..utils import (
NO_DEFAULT,
)
from ..utils import (
NO_DEFAULT,
@@
-461,7
+461,7
@@
class InfoExtractor(object):
return xml_string
if transform_source:
xml_string = transform_source(xml_string)
return xml_string
if transform_source:
xml_string = transform_source(xml_string)
- return
xml.etree.ElementTree.
fromstring(xml_string.encode('utf-8'))
+ return
compat_etree_
fromstring(xml_string.encode('utf-8'))
def _download_json(self, url_or_request, video_id,
note='Downloading JSON metadata',
def _download_json(self, url_or_request, video_id,
note='Downloading JSON metadata',