Update upstream source from tag 'upstream/2020.06.16.1'

[youtubedl] / youtube_dl / extractor / fc2.py

diff --git a/youtube_dl/extractor/fc2.py b/youtube_dl/extractor/fc2.py
index c032d4d0282cc7907b08ec42de9ac842dd4a34c2..435561147feb991cf3595a3a4d71914a5c0154f6 100644 (file)
--- a/youtube_dl/extractor/fc2.py
+++ b/youtube_dl/extractor/fc2.py
@@ -46,7 +46,7 @@ class FC2IE(InfoExtractor):
     }]
 
     def _login(self):
     }]
 
     def _login(self):

-        (username, password) = self._get_login_info()
+        username, password = self._get_login_info()

         if username is None or password is None:
             return False
 
         if username is None or password is None:
             return False
 


@@ -133,7 +133,7 @@ class FC2EmbedIE(InfoExtractor):
             'id': '201403223kCqB3Ez',
             'ext': 'flv',
             'title': 'プリズン･ブレイク S1-01 マイケル 【吹替】',
             'id': '201403223kCqB3Ez',
             'ext': 'flv',
             'title': 'プリズン･ブレイク S1-01 マイケル 【吹替】',

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

         },
     }
 
         },
     }