From 7d9601d6c45ddd5a5330e2c47c440694f51f3d33 Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 18 Oct 2015 10:22:52 +0200 Subject: [PATCH] [youporn] Removed Try and Except lines --- youtube_dl/extractor/youporn.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py index 811138547..ac35be13f 100644 --- a/youtube_dl/extractor/youporn.py +++ b/youtube_dl/extractor/youporn.py @@ -47,14 +47,11 @@ class YouPornIE(InfoExtractor): age_limit = self._rta_search(webpage) self.report_extraction(video_id) - try: - video_title = self._html_search_regex(r'page_params.video_title = \'(.+?)\';', webpage, 'video URL') - video_description = self._html_search_meta('description', webpage, 'video DESC') - video_thumbnail = self._html_search_regex(r'page_params.imageurl\t=\t"(.+?)";', webpage, 'video THUMB') - video_uploader = self._html_search_regex(r"
By:
\n]+\">(.+?)", webpage, 'video UPLOADER') - video_date = self._html_search_regex(r"
\n (.+?)\n
", webpage, 'video DATE') - except KeyError: - raise ExtractorError('Missing JSON parameter: ' + sys.exc_info()[1]) + video_title = self._html_search_regex(r'page_params.video_title = \'(.+?)\';', webpage, 'video URL') + video_description = self._html_search_meta('description', webpage, 'video DESC') + video_thumbnail = self._html_search_regex(r'page_params.imageurl\t=\t"(.+?)";', webpage, 'video THUMB') + video_uploader = self._html_search_regex(r"
By:
\n]+\">(.+?)", webpage, 'video UPLOADER') + video_date = self._html_search_regex(r"
\n (.+?)\n
", webpage, 'video DATE') # Get all of the links from the page DOWNLOAD_LIST_RE = r'(?s)