diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-09-06 07:42:15 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-09-06 07:42:15 +0600 |
| commit | 515fc8776fa1fff6ab3b1e2445ddccf5a22c520b (patch) | |
| tree | 2e8446241d1759da152ed25521f2c3a4c7b4b9c2 | |
| parent | c7c0996d8c2136dc863e45169a19def3269562a0 (diff) | |
| download | youtube-dl-515fc8776fa1fff6ab3b1e2445ddccf5a22c520b.tar.gz youtube-dl-515fc8776fa1fff6ab3b1e2445ddccf5a22c520b.tar.xz youtube-dl-515fc8776fa1fff6ab3b1e2445ddccf5a22c520b.zip | |
[youtube] Use encode_dict
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 030ec70ca..231c86c37 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -26,6 +26,7 @@ from ..compat import ( ) from ..utils import ( clean_html, + encode_dict, ExtractorError, float_or_none, get_element_by_attribute, @@ -111,10 +112,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor): 'hl': 'en_US', } - # 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('ascii') + login_data = compat_urllib_parse.urlencode(encode_dict(login_form_strs)).encode('ascii') req = compat_urllib_request.Request(self._LOGIN_URL, login_data) login_results = self._download_webpage( @@ -147,8 +145,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor): 'TrustDevice': 'on', }) - tfa_form = dict((k.encode('utf-8'), v.encode('utf-8')) for k, v in tfa_form_strs.items()) - tfa_data = compat_urllib_parse.urlencode(tfa_form).encode('ascii') + tfa_data = compat_urllib_parse.urlencode(encode_dict(tfa_form_strs)).encode('ascii') tfa_req = compat_urllib_request.Request(self._TWOFACTOR_URL, tfa_data) tfa_results = self._download_webpage( |