aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/common.py3
-rw-r--r--youtube_dl/extractor/zdf.py8
2 files changed, 6 insertions, 5 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 5656445a3..4f1b50880 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -210,7 +210,8 @@ class InfoExtractor(object):
""" Returns the data of the page as a string """
return self._download_webpage_handle(url_or_request, video_id, note, errnote)[0]
- def _download_xml(self, url_or_request, video_id, note=u'Downloading XML', errnote=u'Unable to downloand XML'):
+ def _download_xml(self, url_or_request, video_id,
+ note=u'Downloading XML', errnote=u'Unable to download XML'):
"""Return the xml as an xml.etree.ElementTree.Element"""
xml_string = self._download_webpage(url_or_request, video_id, note, errnote)
return xml.etree.ElementTree.fromstring(xml_string.encode('utf-8'))
diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py
index 3c01cc041..689f19735 100644
--- a/youtube_dl/extractor/zdf.py
+++ b/youtube_dl/extractor/zdf.py
@@ -5,7 +5,6 @@ import re
from .common import InfoExtractor
from ..utils import (
- parse_xml_doc,
unified_strdate,
)
@@ -30,9 +29,10 @@ class ZDFIE(InfoExtractor):
video_id = mobj.group('video_id')
xml_url = u'http://www.zdf.de/ZDFmediathek/xmlservice/web/beitragsDetails?ak=web&id=%s' % video_id
- info_xml = self._download_webpage(
- xml_url, video_id, note=u'Downloading video info')
- doc = parse_xml_doc(info_xml)
+ doc = self._download_xml(
+ xml_url, video_id,
+ note=u'Downloading video info',
+ errnote=u'Failed to download video info')
title = doc.find('.//information/title').text
description = doc.find('.//information/detail').text