Update upstream source from tag 'upstream/2020.05.08'

[youtubedl] / youtube_dl / extractor / weiqitv.py

diff --git a/youtube_dl/extractor/weiqitv.py b/youtube_dl/extractor/weiqitv.py
index e333ae345b16e6ff6a25d2f57559c970eaf601d9..7e0befd3922b15194fbcf5e142419c1c62ae46c3 100644 (file)
--- a/youtube_dl/extractor/weiqitv.py
+++ b/youtube_dl/extractor/weiqitv.py
@@ -6,7 +6,7 @@ from .common import InfoExtractor
 
 class WeiqiTVIE(InfoExtractor):
     IE_DESC = 'WQTV'
 
 class WeiqiTVIE(InfoExtractor):
     IE_DESC = 'WQTV'

-    _VALID_URL = r'http://www\.weiqitv\.com/index/video_play\?videoId=(?P<id>[A-Za-z0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?weiqitv\.com/index/video_play\?videoId=(?P<id>[A-Za-z0-9]+)'

 
     _TESTS = [{
         'url': 'http://www.weiqitv.com/index/video_play?videoId=53c744f09874f0e76a8b46f3',
 
     _TESTS = [{
         'url': 'http://www.weiqitv.com/index/video_play?videoId=53c744f09874f0e76a8b46f3',


@@ -37,11 +37,11 @@ class WeiqiTVIE(InfoExtractor):
         page = self._download_webpage(url, media_id)
 
         info_json_str = self._search_regex(
         page = self._download_webpage(url, media_id)
 
         info_json_str = self._search_regex(

-            'var\s+video\s*=\s*(.+});', page, 'info json str')
+            r'var\s+video\s*=\s*(.+});', page, 'info json str')

         info_json = self._parse_json(info_json_str, media_id)
 
         letvcloud_url = self._search_regex(
         info_json = self._parse_json(info_json_str, media_id)
 
         letvcloud_url = self._search_regex(

-            'var\s+letvurl\s*=\s*"([^"]+)', page, 'letvcloud url')
+            r'var\s+letvurl\s*=\s*"([^"]+)', page, 'letvcloud url')

 
         return {
             '_type': 'url_transparent',
 
         return {
             '_type': 'url_transparent',