New upstream version 2018.11.07

[youtubedl] / youtube_dl / extractor / funimation.py

diff --git a/youtube_dl/extractor/funimation.py b/youtube_dl/extractor/funimation.py
index 8c37509ec60f132671952c8ad018e4ba79a5fac6..07d01caecfe6a1cc9bde8e23eb8d3955cdeda62c 100644 (file)
--- a/youtube_dl/extractor/funimation.py
+++ b/youtube_dl/extractor/funimation.py
@@ -51,13 +51,13 @@ class FunimationIE(InfoExtractor):
     }]
 
     def _login(self):
     }]
 
     def _login(self):

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

         if username is None:
             return
         try:
             data = self._download_json(
                 'https://prod-api-funimationnow.dadcdigital.com/api/auth/login/',
         if username is None:
             return
         try:
             data = self._download_json(
                 'https://prod-api-funimationnow.dadcdigital.com/api/auth/login/',

-                None, 'Logging in as %s' % username, data=urlencode_postdata({
+                None, 'Logging in', data=urlencode_postdata({

                     'username': username,
                     'password': password,
                 }))
                     'username': username,
                     'password': password,
                 }))