projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vbox7] New video checksum
[youtube-dl]
/
youtube_dl
/
extractor
/
cnn.py
diff --git
a/youtube_dl/extractor/cnn.py
b/youtube_dl/extractor/cnn.py
index a79f881cd9dbf54b8fdb3ff229de1d0e6b9c6aac..a034bb2fb6288fc62d964021405aa94eff532ff6 100644
(file)
--- a/
youtube_dl/extractor/cnn.py
+++ b/
youtube_dl/extractor/cnn.py
@@
-1,12
+1,11
@@
import re
import re
-import xml.etree.ElementTree
from .common import InfoExtractor
from ..utils import determine_ext
class CNNIE(InfoExtractor):
from .common import InfoExtractor
from ..utils import determine_ext
class CNNIE(InfoExtractor):
- _VALID_URL = r'''(?x)https?://(
edition
\.)?cnn\.com/video/(data/.+?|\?)/
+ _VALID_URL = r'''(?x)https?://(
(edition|www)
\.)?cnn\.com/video/(data/.+?|\?)/
(?P<path>.+?/(?P<title>[^/]+?)(?:\.cnn|(?=&)))'''
_TESTS = [{
(?P<path>.+?/(?P<title>[^/]+?)(?:\.cnn|(?=&)))'''
_TESTS = [{
@@
-33,8
+32,7
@@
class CNNIE(InfoExtractor):
path = mobj.group('path')
page_title = mobj.group('title')
info_url = u'http://cnn.com/video/data/3.0/%s/index.xml' % path
path = mobj.group('path')
page_title = mobj.group('title')
info_url = u'http://cnn.com/video/data/3.0/%s/index.xml' % path
- info_xml = self._download_webpage(info_url, page_title)
- info = xml.etree.ElementTree.fromstring(info_xml.encode('utf-8'))
+ info = self._download_xml(info_url, page_title)
formats = []
for f in info.findall('files/file'):
formats = []
for f in info.findall('files/file'):