From: Jaime Marquínez Ferrándiz Date: Sat, 20 Apr 2013 09:40:05 +0000 (+0200) Subject: Use _download_webpage in MetacafeIE X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=089e843b0f9ae9f99be6406896829dc591f80122;p=youtube-dl Use _download_webpage in MetacafeIE --- diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index e0a26eb58..5052f3ec8 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -732,12 +732,7 @@ class MetacafeIE(InfoExtractor): # Retrieve video webpage to extract further information request = compat_urllib_request.Request('http://www.metacafe.com/watch/%s/' % video_id) - try: - self.report_download_webpage(video_id) - webpage = compat_urllib_request.urlopen(request).read() - except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: - self._downloader.report_error(u'unable retrieve video webpage: %s' % compat_str(err)) - return + webpage = self._download_webpage(request, video_id) # Extract URL, uploader and title from webpage self.report_extraction(video_id)