projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bandcamp] Fix variable name
[youtube-dl]
/
youtube_dl
/
extractor
/
teamcoco.py
diff --git
a/youtube_dl/extractor/teamcoco.py
b/youtube_dl/extractor/teamcoco.py
index bc48620f0b992366e866181b1dad22aeb2e5d0a6..2bf26d05682e8e2535d412c2718d78bec6077622 100644
(file)
--- a/
youtube_dl/extractor/teamcoco.py
+++ b/
youtube_dl/extractor/teamcoco.py
@@
-1,5
+1,4
@@
import re
import re
-import xml.etree.ElementTree
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
@@
-32,8
+31,7
@@
class TeamcocoIE(InfoExtractor):
self.report_extraction(video_id)
data_url = 'http://teamcoco.com/cvp/2.0/%s.xml' % video_id
self.report_extraction(video_id)
data_url = 'http://teamcoco.com/cvp/2.0/%s.xml' % video_id
- data_xml = self._download_webpage(data_url, video_id, 'Downloading data webpage')
- data = xml.etree.ElementTree.fromstring(data_xml.encode('utf-8'))
+ data = self._download_xml(data_url, video_id, 'Downloading data webpage')
qualities = ['500k', '480p', '1000k', '720p', '1080p']
qualities = ['500k', '480p', '1000k', '720p', '1080p']
@@
-60,7
+58,7
@@
class TeamcocoIE(InfoExtractor):
return -1
formats.sort(key=sort_key)
if not formats:
return -1
formats.sort(key=sort_key)
if not formats:
- raise
RegexNotFound
Error(u'Unable to extract video URL')
+ raise
Extractor
Error(u'Unable to extract video URL')
return {
'id': video_id,
return {
'id': video_id,