From 1d01f26ab122258e06828ed411522af9fae80fe4 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 21 Aug 2014 11:57:03 +0200 Subject: [PATCH] [ellentv] Simplify and correct tests --- youtube_dl/extractor/ellentv.py | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/youtube_dl/extractor/ellentv.py b/youtube_dl/extractor/ellentv.py index 933f36dd85..3e79236489 100644 --- a/youtube_dl/extractor/ellentv.py +++ b/youtube_dl/extractor/ellentv.py @@ -4,10 +4,14 @@ from __future__ import unicode_literals import re import json -from .common import InfoExtractor, ExtractorError +from .common import InfoExtractor +from ..utils import ( + ExtractorError, + parse_iso8601, +) + class EllenTVIE(InfoExtractor): - IE_NAME = u'ellentv' _VALID_URL = r'https?://(?:www\.)?ellentv\.com/videos/(?P[a-z0-9_-]+)' _TEST = { 'url': 'http://www.ellentv.com/videos/0-7jqrsr18/', @@ -15,43 +19,39 @@ class EllenTVIE(InfoExtractor): 'info_dict': { 'id': '0-7jqrsr18', 'ext': 'mp4', - 'title': u'What\'s Wrong with These Photos? A Whole Lot', - # TODO more properties, either as: - # * A value - # * MD5 checksum; start the string with md5: - # * A regular expression; start the string with re: - # * Any Python type (for example int or float) + 'title': 'What\'s Wrong with These Photos? A Whole Lot', + 'timestamp': 1406876400, + 'upload_date': '20140801', } } def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) - id = mobj.group('id') + video_id = mobj.group('id') - webpage = self._download_webpage(url, id) + webpage = self._download_webpage(url, video_id) + timestamp = parse_iso8601(self._search_regex( + r'