Update upstream source from tag 'upstream/2019.09.28'

[youtubedl] / youtube_dl / extractor / senateisvp.py

diff --git a/youtube_dl/extractor/senateisvp.py b/youtube_dl/extractor/senateisvp.py
index 35540c082ef2f7c4d6fa9cf9ce8acf404bc33a8c..db5ef8b57bba44449cef02bd17eb9dc363c56b15 100644 (file)
--- a/youtube_dl/extractor/senateisvp.py
+++ b/youtube_dl/extractor/senateisvp.py
@@ -55,7 +55,7 @@ class SenateISVPIE(InfoExtractor):
             'id': 'judiciary031715',
             'ext': 'mp4',
             'title': 'Integrated Senate Video Player',
             'id': 'judiciary031715',
             'ext': 'mp4',
             'title': 'Integrated Senate Video Player',

-            'thumbnail': 're:^https?://.*\.(?:jpg|png)$',
+            'thumbnail': r're:^https?://.*\.(?:jpg|png)$',

         },
         'params': {
             # m3u8 download
         },
         'params': {
             # m3u8 download


@@ -89,7 +89,7 @@ class SenateISVPIE(InfoExtractor):
     @staticmethod
     def _search_iframe_url(webpage):
         mobj = re.search(
     @staticmethod
     def _search_iframe_url(webpage):
         mobj = re.search(

-            r"<iframe[^>]+src=['\"](?P<url>http://www\.senate\.gov/isvp/?\?[^'\"]+)['\"]",
+            r"<iframe[^>]+src=['\"](?P<url>https?://www\.senate\.gov/isvp/?\?[^'\"]+)['\"]",

             webpage)
         if mobj:
             return mobj.group('url')
             webpage)
         if mobj:
             return mobj.group('url')