diff options
| -rw-r--r-- | test/test_download.py | 7 | ||||
| -rwxr-xr-x | youtube_dl/InfoExtractors.py | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/test/test_download.py b/test/test_download.py index a8de1d002..59a6e1498 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -81,9 +81,8 @@ def generator(test_case): params.update(test_case.get('params', {})) fd = FileDownloader(params) - fd.add_info_extractor(ie()) - for ien in test_case.get('add_ie', []): - fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')()) + for ie in youtube_dl.InfoExtractors.gen_extractors(): + fd.add_info_extractor(ie) finished_hook_called = set() def _hook(status): if status['status'] == 'finished': @@ -103,7 +102,7 @@ def generator(test_case): if retry == RETRIES: raise # Check if the exception is not a network related one - if not err.exc_info[0] in (ZeroDivisionError, compat_urllib_error.URLError, socket.timeout): + if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError): raise print('Retrying: {0} failed tries\n\n##########\n\n'.format(retry)) diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 1bd9e25c4..aa8074a9e 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -1722,9 +1722,7 @@ class YoutubePlaylistIE(InfoExtractor): (?: (?:course|view_play_list|my_playlists|artist|playlist|watch) \? (?:.*?&)*? (?:p|a|list)= - | user/.*?/user/ | p/ - | user/.*?#[pg]/c/ ) ((?:PL|EC|UU)?[0-9A-Za-z-_]{10,}) .* @@ -3808,7 +3806,7 @@ class WorldStarHipHopIE(InfoExtractor): _title = r"""<title>(.*)</title>""" mobj = re.search(_title, webpage_src) - + if mobj is not None: title = mobj.group(1) else: @@ -3826,7 +3824,7 @@ class WorldStarHipHopIE(InfoExtractor): if mobj is not None: title = mobj.group(1) thumbnail = None - + results = [{ 'id': video_id, 'url' : video_url, |