projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master' into bliptv
[youtube-dl]
/
youtube_dl
/
downloader
/
f4m.py
diff --git
a/youtube_dl/downloader/f4m.py
b/youtube_dl/downloader/f4m.py
index 7f6143954d3d4fdd633eefd3b85a75ea5c07dda8..6170cc1552194104ea1f029ec9b54c2b051e7a9c 100644
(file)
--- a/
youtube_dl/downloader/f4m.py
+++ b/
youtube_dl/downloader/f4m.py
@@
-5,10
+5,10
@@
import io
import itertools
import os
import time
import itertools
import os
import time
-import xml.etree.ElementTree as etree
from .fragment import FragmentFD
from ..compat import (
from .fragment import FragmentFD
from ..compat import (
+ compat_etree_fromstring,
compat_urlparse,
compat_urllib_error,
compat_urllib_parse_urlparse,
compat_urlparse,
compat_urllib_error,
compat_urllib_parse_urlparse,
@@
-290,7
+290,7
@@
class F4mFD(FragmentFD):
man_url = urlh.geturl()
manifest = urlh.read()
man_url = urlh.geturl()
manifest = urlh.read()
- doc =
etree.
fromstring(manifest)
+ doc =
compat_etree_
fromstring(manifest)
formats = [(int(f.attrib.get('bitrate', -1)), f)
for f in self._get_unencrypted_media(doc)]
if requested_bitrate is None:
formats = [(int(f.attrib.get('bitrate', -1)), f)
for f in self._get_unencrypted_media(doc)]
if requested_bitrate is None: