From c950d57de684b3ab6613960565ccf4189221b9f1 Mon Sep 17 00:00:00 2001 From: fourjr <28086837+fourjr@users.noreply.github.com> Date: Sun, 22 Nov 2020 18:04:45 +0800 Subject: [PATCH] [channelnewsasia] follow conventions --- youtube_dl/extractor/channelnewsasia.py | 45 +++++++++++-------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/youtube_dl/extractor/channelnewsasia.py b/youtube_dl/extractor/channelnewsasia.py index 7a59192d7..511fee2d5 100644 --- a/youtube_dl/extractor/channelnewsasia.py +++ b/youtube_dl/extractor/channelnewsasia.py @@ -1,40 +1,36 @@ # coding: utf-8 from __future__ import unicode_literals -import re from .common import InfoExtractor class ChannelNewsAsiaIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?channelnewsasia\.com/(?:(?:-|\w|\d)+)/(?:(?:-|\w|\d)+)/(?P(?:-|\w|\d)+)' - _TESTS = [ - { - 'url': 'https://www.channelnewsasia.com/news/video-on-demand/wizards-of-tech/wizards-of-tech-body-13515106', - 'md5': 'ed9ed143052f0da3ee8a8fa59ba16870', - 'info_dict': { - 'id': 'w0ZWRzajE6qDPXDb7DSeaOCJ3bJ3GDqC', - 'ext': 'mp4', - 'title': 'Wizards Of Tech_2020_0_1_Body', - 'description': 'md5:b3882dd00e329e623a179465de9f5478', - }, + _TESTS = [{ + 'url': 'https://www.channelnewsasia.com/news/video-on-demand/wizards-of-tech/wizards-of-tech-body-13515106', + 'md5': 'ed9ed143052f0da3ee8a8fa59ba16870', + 'info_dict': { + 'id': 'w0ZWRzajE6qDPXDb7DSeaOCJ3bJ3GDqC', + 'ext': 'mp4', + 'title': 'Wizards Of Tech_2020_0_1_Body', + 'description': 'md5:b3882dd00e329e623a179465de9f5478', }, - { - 'url': 'https://www.channelnewsasia.com/news/asia/removing-the-negative-influences-of-religion-in-tibet-video-13604084', - 'md5': 'ed846cfca037823fa6d3d0d7af8a4e8f', - 'info_dict': { - 'id': 'ljZjd0ajE6NNMhVJ3Gb-QfL1l0p-qW6-', - 'ext': 'mp4', - 'title': "Removing the 'negative influences of religion' in Tibet | Video", - 'description': 'md5:777989926133319de6f6501372175fbf', - }, - } - ] + }, { + 'url': 'https://www.channelnewsasia.com/news/asia/removing-the-negative-influences-of-religion-in-tibet-video-13604084', + 'md5': 'ed846cfca037823fa6d3d0d7af8a4e8f', + 'info_dict': { + 'id': 'ljZjd0ajE6NNMhVJ3Gb-QfL1l0p-qW6-', + 'ext': 'mp4', + 'title': "Removing the 'negative influences of religion' in Tibet | Video", + 'description': 'md5:777989926133319de6f6501372175fbf', + }, + }] def _real_extract(self, url): display_id = self._match_id(url) webpage = self._download_webpage(url, display_id) - + ooyala_id = ( self._search_regex( r'id="ooyala-\d+-((?:\d|\w|-)+)--\d+', webpage, 'ooyala id', @@ -44,5 +40,4 @@ class ChannelNewsAsiaIE(InfoExtractor): default=None, fatal=False)) return self.url_result( - 'ooyala:' + ooyala_id, 'Ooyala', ooyala_id - ) + 'ooyala:' + ooyala_id, 'Ooyala', ooyala_id)