From 4b10aadffc120b0b6ee8f150f1f319e1cce853a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Wed, 23 Apr 2014 19:42:34 +0700 Subject: [PATCH] [dailymotion] Fix user playlist extraction --- youtube_dl/extractor/dailymotion.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index c759b9889..55216201f 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -11,8 +11,8 @@ orderedSet, str_to_int, int_or_none, - ExtractorError, + unescapeHTML, ) class DailymotionBaseInfoExtractor(InfoExtractor): @@ -188,7 +188,7 @@ def _extract_entries(self, id): webpage = self._download_webpage(request, id, u'Downloading page %s' % pagenum) - video_ids.extend(re.findall(r'data-id="(.+?)"', webpage)) + video_ids.extend(re.findall(r'data-xid="(.+?)"', webpage)) if re.search(self._MORE_PAGES_INDICATOR, webpage) is None: break @@ -217,9 +217,9 @@ def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) user = mobj.group('user') webpage = self._download_webpage(url, user) - full_user = self._html_search_regex( - r'(.*?)' % re.escape(user), + webpage, u'user', flags=re.DOTALL)) return { '_type': 'playlist',