debian/watch: Add back pgpsigurlmangle.

[youtubedl] / youtube_dl / extractor / niconico.py

diff --git a/youtube_dl/extractor/niconico.py b/youtube_dl/extractor/niconico.py
index bda1cff056d35ffd9cb876a0cc2fc141a6ce2ba1..dd75a48afcc9dfa4a728c600c836741785056770 100644 (file)
--- a/youtube_dl/extractor/niconico.py
+++ b/youtube_dl/extractor/niconico.py
@@ -7,18 +7,18 @@ import datetime
 
 from .common import InfoExtractor
 from ..compat import (
 
 from .common import InfoExtractor
 from ..compat import (

-    compat_urllib_parse,
-    compat_urllib_request,
+    compat_urllib_parse_urlencode,

     compat_urlparse,
 )
 from ..utils import (
     compat_urlparse,
 )
 from ..utils import (

-    encode_dict,

     ExtractorError,
     int_or_none,
     parse_duration,
     parse_iso8601,
     ExtractorError,
     int_or_none,
     parse_duration,
     parse_iso8601,

+    sanitized_Request,

     xpath_text,
     determine_ext,
     xpath_text,
     determine_ext,

+    urlencode_postdata,

 )
 
 
 )
 
 


@@ -101,8 +101,8 @@ class NiconicoIE(InfoExtractor):
             'mail': username,
             'password': password,
         }
             'mail': username,
             'password': password,
         }

-        login_data = compat_urllib_parse.urlencode(encode_dict(login_form_strs)).encode('utf-8')
-        request = compat_urllib_request.Request(
+        login_data = urlencode_postdata(login_form_strs)
+        request = sanitized_Request(

             'https://secure.nicovideo.jp/secure/login', login_data)
         login_results = self._download_webpage(
             request, None, note='Logging in', errnote='Unable to log in')
             'https://secure.nicovideo.jp/secure/login', login_data)
         login_results = self._download_webpage(
             request, None, note='Logging in', errnote='Unable to log in')


@@ -141,11 +141,11 @@ class NiconicoIE(InfoExtractor):
                 r'\'thumbPlayKey\'\s*:\s*\'(.*?)\'', ext_player_info, 'thumbPlayKey')
 
             # Get flv info
                 r'\'thumbPlayKey\'\s*:\s*\'(.*?)\'', ext_player_info, 'thumbPlayKey')
 
             # Get flv info

-            flv_info_data = compat_urllib_parse.urlencode({
+            flv_info_data = compat_urllib_parse_urlencode({

                 'k': thumb_play_key,
                 'v': video_id
             })
                 'k': thumb_play_key,
                 'v': video_id
             })

-            flv_info_request = compat_urllib_request.Request(
+            flv_info_request = sanitized_Request(

                 'http://ext.nicovideo.jp/thumb_watch', flv_info_data,
                 {'Content-Type': 'application/x-www-form-urlencoded'})
             flv_info_webpage = self._download_webpage(
                 'http://ext.nicovideo.jp/thumb_watch', flv_info_data,
                 {'Content-Type': 'application/x-www-form-urlencoded'})
             flv_info_webpage = self._download_webpage(