diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py index f659fdd7d..dd216fc09 100644 --- a/youtube_dl/extractor/abc.py +++ b/youtube_dl/extractor/abc.py @@ -17,6 +17,7 @@ from ..utils import ( update_url_query, ) + class ABCIE(InfoExtractor): IE_NAME = 'abc.net.au' _VALID_URL = r'https?://(?:www\.)?abc\.net\.au/news/(?:[^/]+/){1,2}(?P\d+)' @@ -73,12 +74,11 @@ class ABCIE(InfoExtractor): youtube_link = self._html_search_regex(r'(?s)a href="http://www.youtube.com/(.+?)"', webpage, 'youtube_link', None) if youtube_link: - youtube_link = "http://www.youtube.com/"+youtube_link + youtube_link = "http://www.youtube.com/" + youtube_link return self.url_result(youtube_link) if mobj is None: expired = self._html_search_regex(r'(?s)class="expired-(?:video|audio)".+?(.+?)', webpage, 'expired', None) - if expired: raise ExtractorError('%s said: %s' % (self.IE_NAME, expired), expected=True) @@ -90,7 +90,6 @@ class ABCIE(InfoExtractor): if not isinstance(urls_info, list): urls_info = [urls_info] - if mobj.group('type') == 'YouTube': return self.playlist_result([ self.url_result(url_info['url']) for url_info in urls_info]) diff --git a/youtube_dl/extractor/espn.py b/youtube_dl/extractor/espn.py index 96f9960d1..43bd767ea 100644 --- a/youtube_dl/extractor/espn.py +++ b/youtube_dl/extractor/espn.py @@ -98,13 +98,13 @@ class ESPNIE(OnceIE): }, { 'url': 'http://www.espn.com/espnw/video/26066627/arkansas-gibson-completes-hr-cycle-four-innings', 'only_matching': True, - },{ + }, { 'url': 'https://www.espn.co.uk/video/clip/_/id/25103188', 'only_matching': True, - },{ + }, { 'url': 'https://www.espn.co.uk/video/clip/_/id/29069602', 'only_matching': True, - },{ + }, { 'url': 'https://www.espn.co.uk/video/clip/_/id/19367162', 'only_matching': True, }]