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/common.py | |
| parent | dbd82a1d4fff1655920e111cc25a7fd526d7bf9a (diff) | |
| parent | ae37338e681319a28d98dc551253d9fa1830969a (diff) | |
| download | youtube-dl-30eecc6a044d4070d0e8ea4a6e0637867f0d3a28.tar.xz | |
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/common.py')
| -rw-r--r-- | youtube_dl/extractor/common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 1f09fbb47..5e263f8b5 100644 --- 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 xml.etree.ElementTree from ..compat import ( compat_cookiejar, @@ -23,6 +22,7 @@ from ..compat import ( compat_urllib_request, compat_urlparse, compat_str, + compat_etree_fromstring, ) 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.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', |