projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[turner,cnn] move a check for wrong timestamp to CNNIE
[youtube-dl]
/
youtube_dl
/
extractor
/
fc2.py
diff --git
a/youtube_dl/extractor/fc2.py
b/youtube_dl/extractor/fc2.py
index 9580f5c0c5d1f4eb9bd54eb76126744322ae85e9..c7d69ff1f980de46bd4ecce96e4ac301b1f1be59 100644
(file)
--- a/
youtube_dl/extractor/fc2.py
+++ b/
youtube_dl/extractor/fc2.py
@@
-5,19
+5,18
@@
import hashlib
from .common import InfoExtractor
from ..compat import (
from .common import InfoExtractor
from ..compat import (
- compat_urllib_parse,
compat_urllib_request,
compat_urlparse,
)
from ..utils import (
compat_urllib_request,
compat_urlparse,
)
from ..utils import (
- encode_dict,
ExtractorError,
sanitized_Request,
ExtractorError,
sanitized_Request,
+ urlencode_postdata,
)
class FC2IE(InfoExtractor):
)
class FC2IE(InfoExtractor):
- _VALID_URL = r'^http://video\.fc2\.com/(?:[^/]+/)*content/(?P<id>[^/]+)'
+ _VALID_URL = r'^http
s?
://video\.fc2\.com/(?:[^/]+/)*content/(?P<id>[^/]+)'
IE_NAME = 'fc2'
_NETRC_MACHINE = 'fc2'
_TESTS = [{
IE_NAME = 'fc2'
_NETRC_MACHINE = 'fc2'
_TESTS = [{
@@
-57,7
+56,7
@@
class FC2IE(InfoExtractor):
'Submit': ' Login ',
}
'Submit': ' Login ',
}
- 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.id.fc2.com/index.php?mode=login&switch_language=en', login_data)
request = sanitized_Request(
'https://secure.id.fc2.com/index.php?mode=login&switch_language=en', login_data)