summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-09-06 07:42:45 +0600
committerSergey M․ <dstftw@gmail.com>2015-09-06 07:42:45 +0600
commitcd019668dc06b3fec1de9168a7414f3bcc3fe52b (patch)
treeb2ad4776bea5bf7c59a084a1c12953ed0c9c38b7
parent515fc8776fa1fff6ab3b1e2445ddccf5a22c520b (diff)
downloadyoutube-dl-cd019668dc06b3fec1de9168a7414f3bcc3fe52b.tar.gz
youtube-dl-cd019668dc06b3fec1de9168a7414f3bcc3fe52b.tar.xz
youtube-dl-cd019668dc06b3fec1de9168a7414f3bcc3fe52b.zip
[niconico] Use encode_dict
-rw-r--r--youtube_dl/extractor/niconico.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/niconico.py b/youtube_dl/extractor/niconico.py
index 0f8aa5ada..bda1cff05 100644
--- a/youtube_dl/extractor/niconico.py
+++ b/youtube_dl/extractor/niconico.py
@@ -12,6 +12,7 @@ from ..compat import (
     compat_urlparse,
 )
 from ..utils import (
+    encode_dict,
     ExtractorError,
     int_or_none,
     parse_duration,
@@ -100,10 +101,7 @@ class NiconicoIE(InfoExtractor):
             'mail': username,
             'password': password,
         }
-        # Convert to UTF-8 *before* urlencode because Python 2.x's urlencode
-        # chokes on unicode
-        login_form = dict((k.encode('utf-8'), v.encode('utf-8')) for k, v in login_form_strs.items())
-        login_data = compat_urllib_parse.urlencode(login_form).encode('utf-8')
+        login_data = compat_urllib_parse.urlencode(encode_dict(login_form_strs)).encode('utf-8')
         request = compat_urllib_request.Request(
             'https://secure.nicovideo.jp/secure/login', login_data)
         login_results = self._download_webpage(