projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[clipfish] Fix imports (#1842)
[youtube-dl]
/
youtube_dl
/
extractor
/
clipfish.py
diff --git
a/youtube_dl/extractor/clipfish.py
b/youtube_dl/extractor/clipfish.py
index 95449da3cc3b50915a2265f1baf14e4e77652584..ba56235728b3e7afb8d4f7f1be0cd46ca5ed07b4 100644
(file)
--- a/
youtube_dl/extractor/clipfish.py
+++ b/
youtube_dl/extractor/clipfish.py
@@
-3,6
+3,7
@@
import time
import xml.etree.ElementTree
from .common import InfoExtractor
import xml.etree.ElementTree
from .common import InfoExtractor
+from ..utils import ExtractorError
class ClipfishIE(InfoExtractor):
class ClipfishIE(InfoExtractor):
@@
-25,11
+26,14
@@
class ClipfishIE(InfoExtractor):
info_url = ('http://www.clipfish.de/devxml/videoinfo/%s?ts=%d' %
(video_id, int(time.time())))
info_url = ('http://www.clipfish.de/devxml/videoinfo/%s?ts=%d' %
(video_id, int(time.time())))
-
info_xml = self._download_webpage
(
+
doc = self._download_xml
(
info_url, video_id, note=u'Downloading info page')
info_url, video_id, note=u'Downloading info page')
- doc = xml.etree.ElementTree.fromstring(info_xml)
title = doc.find('title').text
video_url = doc.find('filename').text
title = doc.find('title').text
video_url = doc.find('filename').text
+ if video_url is None:
+ xml_bytes = xml.etree.ElementTree.tostring(doc)
+ raise ExtractorError(u'Cannot find video URL in document %r' %
+ xml_bytes)
thumbnail = doc.find('imageurl').text
duration_str = doc.find('duration').text
m = re.match(
thumbnail = doc.find('imageurl').text
duration_str = doc.find('duration').text
m = re.match(