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/crunchyroll.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/crunchyroll.py')
| -rw-r--r-- | youtube_dl/extractor/crunchyroll.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py index f8ce10111..0c9b8ca02 100644 --- a/youtube_dl/extractor/crunchyroll.py +++ b/youtube_dl/extractor/crunchyroll.py @@ -5,12 +5,12 @@ import re import json import base64 import zlib -import xml.etree.ElementTree from hashlib import sha1 from math import pow, sqrt, floor from .common import InfoExtractor from ..compat import ( + compat_etree_fromstring, compat_urllib_parse, compat_urllib_parse_unquote, compat_urllib_request, @@ -234,7 +234,7 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text return output def _extract_subtitles(self, subtitle): - sub_root = xml.etree.ElementTree.fromstring(subtitle) + sub_root = compat_etree_fromstring(subtitle) return [{ 'ext': 'srt', 'data': self._convert_subtitles_to_srt(sub_root), |