[zdf] Use _download_xml

This commit is contained in:
Philipp Hagemeister 2013-11-28 05:47:50 +01:00
parent a2e6db365c
commit 2a275ab007
3 changed files with 6 additions and 10 deletions

View file

@ -210,7 +210,8 @@ def _download_webpage(self, url_or_request, video_id, note=None, errnote=None):
""" 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'))

View file

@ -5,7 +5,6 @@
from .common import InfoExtractor
from ..utils import (
parse_xml_doc,
unified_strdate,
)
@ -30,9 +29,10 @@ def _real_extract(self, url):
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

View file

@ -1009,11 +1009,6 @@ def unsmuggle_url(smug_url):
return url, data
def parse_xml_doc(s):
assert isinstance(s, type(u''))
return xml.etree.ElementTree.fromstring(s.encode('utf-8'))
def format_bytes(bytes):
if bytes is None:
return u'N/A'