projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[compat] Add compat_urllib_parse_urlencode and eliminate encode_dict
[youtube-dl]
/
youtube_dl
/
extractor
/
twitch.py
diff --git
a/youtube_dl/extractor/twitch.py
b/youtube_dl/extractor/twitch.py
index d4169ec6dce32613243baa9ef553a2683178b7ef..c92dcc7b90f151a9ed05e82428dc14691b43e220 100644
(file)
--- a/
youtube_dl/extractor/twitch.py
+++ b/
youtube_dl/extractor/twitch.py
@@
-9,12
+9,11
@@
from .common import InfoExtractor
from ..compat import (
compat_parse_qs,
compat_str,
from ..compat import (
compat_parse_qs,
compat_str,
- compat_urllib_parse,
+ compat_urllib_parse
_urlencode
,
compat_urllib_parse_urlparse,
compat_urlparse,
)
from ..utils import (
compat_urllib_parse_urlparse,
compat_urlparse,
)
from ..utils import (
- encode_dict,
ExtractorError,
int_or_none,
orderedSet,
ExtractorError,
int_or_none,
orderedSet,
@@
-82,7
+81,7
@@
class TwitchBaseIE(InfoExtractor):
post_url = compat_urlparse.urljoin(redirect_url, post_url)
request = sanitized_Request(
post_url = compat_urlparse.urljoin(redirect_url, post_url)
request = sanitized_Request(
- post_url, compat_urllib_parse
.urlencode(encode_dict(login_form)
).encode('utf-8'))
+ post_url, compat_urllib_parse
_urlencode(login_form
).encode('utf-8'))
request.add_header('Referer', redirect_url)
response = self._download_webpage(
request, None, 'Logging in as %s' % username)
request.add_header('Referer', redirect_url)
response = self._download_webpage(
request, None, 'Logging in as %s' % username)
@@
-250,7
+249,7
@@
class TwitchVodIE(TwitchItemBaseIE):
formats = self._extract_m3u8_formats(
'%s/vod/%s?%s' % (
self._USHER_BASE, item_id,
formats = self._extract_m3u8_formats(
'%s/vod/%s?%s' % (
self._USHER_BASE, item_id,
- compat_urllib_parse
.
urlencode({
+ compat_urllib_parse
_
urlencode({
'allow_source': 'true',
'allow_audio_only': 'true',
'allow_spectre': 'true',
'allow_source': 'true',
'allow_audio_only': 'true',
'allow_spectre': 'true',
@@
-442,7
+441,7
@@
class TwitchStreamIE(TwitchBaseIE):
}
formats = self._extract_m3u8_formats(
'%s/api/channel/hls/%s.m3u8?%s'
}
formats = self._extract_m3u8_formats(
'%s/api/channel/hls/%s.m3u8?%s'
- % (self._USHER_BASE, channel_id, compat_urllib_parse
.
urlencode(query)),
+ % (self._USHER_BASE, channel_id, compat_urllib_parse
_
urlencode(query)),
channel_id, 'mp4')
self._prefer_source(formats)
channel_id, 'mp4')
self._prefer_source(formats)