Update upstream source from tag 'upstream/2018.11.07'

[youtubedl] / youtube_dl / extractor / niconico.py

diff --git a/youtube_dl/extractor/niconico.py b/youtube_dl/extractor/niconico.py
index df7f528be2d4c8da7cfe826609608754f2f8e088..76b412ff1ae7d2d0866f3357706db365a9c0e613 100644 (file)
--- a/youtube_dl/extractor/niconico.py
+++ b/youtube_dl/extractor/niconico.py
@@ -163,7 +163,7 @@ class NiconicoIE(InfoExtractor):
         self._login()
 
     def _login(self):
         self._login()
 
     def _login(self):

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

         # No authentication to be performed
         if not username:
             return True
         # No authentication to be performed
         if not username:
             return True


@@ -252,7 +252,7 @@ class NiconicoIE(InfoExtractor):
                     },
                     'timing_constraint': 'unlimited'
                 }
                     },
                     'timing_constraint': 'unlimited'
                 }

-            }))
+            }).encode())

 
         resolution = video_quality.get('resolution', {})
 
 
         resolution = video_quality.get('resolution', {})