debian/patches: Remove patch cherry-picked from upstream.

[youtubedl] / youtube_dl / extractor / bellmedia.py

diff --git a/youtube_dl/extractor/bellmedia.py b/youtube_dl/extractor/bellmedia.py
index 32326ed9e3b857fa38bd2b32eca4c9bbaf422ee8..f36a2452d4e9aba89dde708e3bd51ada35ada301 100644 (file)
--- a/youtube_dl/extractor/bellmedia.py
+++ b/youtube_dl/extractor/bellmedia.py
@@ -12,7 +12,7 @@ class BellMediaIE(InfoExtractor):
             (?:
                 ctv|
                 tsn|
             (?:
                 ctv|
                 tsn|

-                bnn|
+                bnn(?:bloomberg)?|

                 thecomedynetwork|
                 discovery|
                 discoveryvelocity|
                 thecomedynetwork|
                 discovery|
                 discoveryvelocity|


@@ -21,22 +21,22 @@ class BellMediaIE(InfoExtractor):
                 animalplanet|
                 bravo|
                 mtv|
                 animalplanet|
                 bravo|
                 mtv|

-                space
+                space|
+                etalk

             )\.ca|
             much\.com
             )\.ca|
             much\.com

-        )/.*?(?:\bvid=|-vid|~|%7E|/(?:episode)?)(?P<id>[0-9]{6})'''
+        )/.*?(?:\bvid(?:eoid)?=|-vid|~|%7E|/(?:episode)?)(?P<id>[0-9]{6,})'''

     _TESTS = [{
     _TESTS = [{

-        'url': 'http://www.ctv.ca/video/player?vid=706966',
-        'md5': 'ff2ebbeae0aa2dcc32a830c3fd69b7b0',
+        'url': 'https://www.bnnbloomberg.ca/video/david-cockfield-s-top-picks~1403070',
+        'md5': '36d3ef559cfe8af8efe15922cd3ce950',

         'info_dict': {
         'info_dict': {

-            'id': '706966',
-            'ext': 'mp4',
-            'title': 'Larry Day and Richard Jutras on the TIFF red carpet of \'Stonewall\'',
-            'description': 'etalk catches up with Larry Day and Richard Jutras on the TIFF red carpet of "Stonewall”.',
-            'upload_date': '20150919',
-            'timestamp': 1442624700,
+            'id': '1403070',
+            'ext': 'flv',
+            'title': 'David Cockfield\'s Top Picks',
+            'description': 'md5:810f7f8c6a83ad5b48677c3f8e5bb2c3',
+            'upload_date': '20180525',
+            'timestamp': 1527288600,

         },
         },

-        'expected_warnings': ['HTTP Error 404'],

     }, {
         'url': 'http://www.thecomedynetwork.ca/video/player?vid=923582',
         'only_matching': True,
     }, {
         'url': 'http://www.thecomedynetwork.ca/video/player?vid=923582',
         'only_matching': True,


@@ -55,6 +55,12 @@ class BellMediaIE(InfoExtractor):
     }, {
         'url': 'http://www.much.com/shows/the-almost-impossible-gameshow/928979/episode-6',
         'only_matching': True,
     }, {
         'url': 'http://www.much.com/shows/the-almost-impossible-gameshow/928979/episode-6',
         'only_matching': True,

+    }, {
+        'url': 'http://www.ctv.ca/DCs-Legends-of-Tomorrow/Video/S2E11-Turncoat-vid1051430',
+        'only_matching': True,
+    }, {
+        'url': 'http://www.etalk.ca/video?videoid=663455',
+        'only_matching': True,

     }]
     _DOMAINS = {
         'thecomedynetwork': 'comedy',
     }]
     _DOMAINS = {
         'thecomedynetwork': 'comedy',


@@ -62,6 +68,8 @@ class BellMediaIE(InfoExtractor):
         'sciencechannel': 'discsci',
         'investigationdiscovery': 'invdisc',
         'animalplanet': 'aniplan',
         'sciencechannel': 'discsci',
         'investigationdiscovery': 'invdisc',
         'animalplanet': 'aniplan',

+        'etalk': 'ctv',
+        'bnnbloomberg': 'bnn',

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