diff options
| author | Sergey M․ <dstftw@gmail.com> | 2014-12-29 20:27:09 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2014-12-29 20:27:09 +0600 |
| commit | 7fc2cd819e10ca6c69cb3601c0bbe7d577256da7 (patch) | |
| tree | 1787efcfaca8dca6faaea9ba5fe5669773384ea8 /youtube_dl | |
| parent | 974739aab5935ddf19c005ea084c83a45c855348 (diff) | |
[cnn] Improve regexes and fix test
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/cnn.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/youtube_dl/extractor/cnn.py b/youtube_dl/extractor/cnn.py index cddcacdf1..1bff005d6 100644 --- a/youtube_dl/extractor/cnn.py +++ b/youtube_dl/extractor/cnn.py @@ -11,14 +11,14 @@ from ..utils import ( class CNNIE(InfoExtractor): - _VALID_URL = r'''(?x)https?://((edition|www)\.)?cnn\.com/video/(data/.+?|\?)/ - (?P<path>.+?/(?P<title>[^/]+?)(?:\.cnn(-ap)?|(?=&)))''' + _VALID_URL = r'''(?x)https?://(?:(?:edition|www)\.)?cnn\.com/video/(?:data/.+?|\?)/ + (?P<path>.+?/(?P<title>[^/]+?)(?:\.cnn(?:-ap)?|(?=&)))''' _TESTS = [{ 'url': 'http://edition.cnn.com/video/?/video/sports/2013/06/09/nadal-1-on-1.cnn', 'md5': '3e6121ea48df7e2259fe73a0628605c4', 'info_dict': { - 'id': 'sports_2013_06_09_nadal-1-on-1.cnn', + 'id': 'sports/2013/06/09/nadal-1-on-1.cnn', 'ext': 'mp4', 'title': 'Nadal wins 8th French Open title', 'description': 'World Sport\'s Amanda Davies chats with 2013 French Open champion Rafael Nadal.', @@ -130,7 +130,7 @@ class CNNBlogsIE(InfoExtractor): class CNNArticleIE(InfoExtractor): - _VALID_URL = r'https?://((edition|www)\.)?cnn\.com/(?!video/)' + _VALID_URL = r'https?://(?:(?:edition|www)\.)?cnn\.com/(?!video/)' _TEST = { 'url': 'http://www.cnn.com/2014/12/21/politics/obama-north-koreas-hack-not-war-but-cyber-vandalism/', 'md5': '275b326f85d80dff7592a9820f5dc887', @@ -149,6 +149,6 @@ class CNNArticleIE(InfoExtractor): cnn_url = self._html_search_regex(r"video:\s*'([^']+)'", webpage, 'cnn url') return { '_type': 'url', - 'url': r'http://cnn.com/video/?/video/' + cnn_url, + 'url': 'http://cnn.com/video/?/video/' + cnn_url, 'ie_key': CNNIE.ie_key(), } |