diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-07-13 20:33:23 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-07-13 20:33:23 +0200 |
| commit | 36034aecc287f67a9f93fa00f374f45dcb0e2f77 (patch) | |
| tree | a24389f75c738587a46f09eb0888b457b50767f8 /youtube_dl/extractor/funnyordie.py | |
| parent | ffca4b5c32280e416131faf43afa0cb26c55c8b0 (diff) | |
| parent | 44dbe8903580e1e62ea6f3881b2fa469853c4a83 (diff) | |
Merge remote-tracking branch 'jaimeMF/opengraph'
Diffstat (limited to 'youtube_dl/extractor/funnyordie.py')
| -rw-r--r-- | youtube_dl/extractor/funnyordie.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index 388aacf2f..67a7e5f76 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -27,14 +27,11 @@ class FunnyOrDieIE(InfoExtractor): title = self._html_search_regex((r"<h1 class='player_page_h1'.*?>(?P<title>.*?)</h1>", r'<title>(?P<title>[^<]+?)</title>'), webpage, 'title', flags=re.DOTALL) - video_description = self._html_search_regex(r'<meta property="og:description" content="(?P<desc>.*?)"', - webpage, u'description', fatal=False, flags=re.DOTALL) - info = { 'id': video_id, 'url': video_url, 'ext': 'mp4', 'title': title, - 'description': video_description, + 'description': self._og_search_description(webpage), } return [info] |