Update upstream source from tag 'upstream/2018.09.10'

[youtubedl] / youtube_dl / extractor / ctvnews.py

diff --git a/youtube_dl/extractor/ctvnews.py b/youtube_dl/extractor/ctvnews.py
index 1023b61300b4d381a0f5019e2a3a04cbc77adc8a..03f8cefb77beb1185e14c2f435616d8f25f70f83 100644 (file)
--- a/youtube_dl/extractor/ctvnews.py
+++ b/youtube_dl/extractor/ctvnews.py
@@ -8,13 +8,13 @@ from ..utils import orderedSet
 
 
 class CTVNewsIE(InfoExtractor):
 
 
 class CTVNewsIE(InfoExtractor):

-    _VALID_URL = r'https?://(?:www\.)?ctvnews\.ca/(?:video\?(?:clip|playlist|bin)Id=|.*?)(?P<id>[0-9.]+)'
+    _VALID_URL = r'https?://(?:.+?\.)?ctvnews\.ca/(?:video\?(?:clip|playlist|bin)Id=|.*?)(?P<id>[0-9.]+)'

     _TESTS = [{
         'url': 'http://www.ctvnews.ca/video?clipId=901995',
     _TESTS = [{
         'url': 'http://www.ctvnews.ca/video?clipId=901995',

-        'md5': '10deb320dc0ccb8d01d34d12fc2ea672',
+        'md5': '9b8624ba66351a23e0b6e1391971f9af',

         'info_dict': {
             'id': '901995',
         'info_dict': {
             'id': '901995',

-            'ext': 'mp4',
+            'ext': 'flv',

             'title': 'Extended: \'That person cannot be me\' Johnson says',
             'description': 'md5:958dd3b4f5bbbf0ed4d045c790d89285',
             'timestamp': 1467286284,
             'title': 'Extended: \'That person cannot be me\' Johnson says',
             'description': 'md5:958dd3b4f5bbbf0ed4d045c790d89285',
             'timestamp': 1467286284,


@@ -40,6 +40,9 @@ class CTVNewsIE(InfoExtractor):
     }, {
         'url': 'http://www.ctvnews.ca/canadiens-send-p-k-subban-to-nashville-in-blockbuster-trade-1.2967231',
         'only_matching': True,
     }, {
         'url': 'http://www.ctvnews.ca/canadiens-send-p-k-subban-to-nashville-in-blockbuster-trade-1.2967231',
         'only_matching': True,

+    }, {
+        'url': 'http://vancouverisland.ctvnews.ca/video?clipId=761241',
+        'only_matching': True,

     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):