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
/
crunchyroll.py
diff --git
a/youtube_dl/extractor/crunchyroll.py
b/youtube_dl/extractor/crunchyroll.py
index f8ce10111df8078638d9c56b837f354b2345ad73..0c9b8ca024cb6022b0e0227dcad2065c64ba69eb 100644
(file)
--- 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 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 (
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,
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):
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),
return [{
'ext': 'srt',
'data': self._convert_subtitles_to_srt(sub_root),