projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify coding cookie
[youtube-dl]
/
youtube_dl
/
extractor
/
niconico.py
diff --git
a/youtube_dl/extractor/niconico.py
b/youtube_dl/extractor/niconico.py
index 586e52a4a4f49151c55ed99baf9cadd136863bbd..a104e33f8bdea73540779e41db45d92c1249668a 100644
(file)
--- a/
youtube_dl/extractor/niconico.py
+++ b/
youtube_dl/extractor/niconico.py
@@
-1,4
+1,4
@@
-#
en
coding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
@@
-7,11
+7,10
@@
import datetime
from .common import InfoExtractor
from ..compat import (
from .common import InfoExtractor
from ..compat import (
- compat_urllib_parse,
+ compat_urllib_parse
_urlencode
,
compat_urlparse,
)
from ..utils import (
compat_urlparse,
)
from ..utils import (
- encode_dict,
ExtractorError,
int_or_none,
parse_duration,
ExtractorError,
int_or_none,
parse_duration,
@@
-19,6
+18,7
@@
from ..utils import (
sanitized_Request,
xpath_text,
determine_ext,
sanitized_Request,
xpath_text,
determine_ext,
+ urlencode_postdata,
)
)
@@
-101,7
+101,7
@@
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'
)
+ login_data =
urlencode_postdata(login_form_strs
)
request = sanitized_Request(
'https://secure.nicovideo.jp/secure/login', login_data)
login_results = self._download_webpage(
request = sanitized_Request(
'https://secure.nicovideo.jp/secure/login', login_data)
login_results = self._download_webpage(
@@
-141,7
+141,7
@@
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
})
@@
-252,7
+252,7
@@
class NiconicoIE(InfoExtractor):
class NiconicoPlaylistIE(InfoExtractor):
class NiconicoPlaylistIE(InfoExtractor):
- _VALID_URL = r'https?://
www\.
nicovideo\.jp/mylist/(?P<id>\d+)'
+ _VALID_URL = r'https?://
(?:www\.)?
nicovideo\.jp/mylist/(?P<id>\d+)'
_TEST = {
'url': 'http://www.nicovideo.jp/mylist/27411728',
_TEST = {
'url': 'http://www.nicovideo.jp/mylist/27411728',