Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[compat] Add compat_urllib_parse_urlencode and eliminate encode_dict

Browse source 
encode_dict functionality has been improved and moved directly into compat_urllib_parse_urlencode
All occurrences of compat_urllib_parse.urlencode throughout the codebase have been replaced by compat_urllib_parse_urlencode

Closes #8974
This commit is contained in:
Sergey M․ 2016-03-26 01:46:57 +06:00
parent 2156f16ca7
commit 15707c7e02
84 changed files with 229 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

12
youtube_dl/extractor/soundcloud.py
View file

@ -11,10 +11,9 @@ from .common import (
from ..compat import (
compat_str,
compat_urlparse,
compat_urllib_parse,
compat_urllib_parse_urlencode,
)
from ..utils import (
encode_dict,
ExtractorError,
int_or_none,
unified_strdate,
@ -393,7 +392,7 @@ class SoundcloudUserIE(SoundcloudIE):
query = COMMON_QUERY.copy()
query['offset'] = 0
next_href = base_url + '?' + compat_urllib_parse.urlencode(query)
next_href = base_url + '?' + compat_urllib_parse_urlencode(query)
entries = []
for i in itertools.count():
@ -424,7 +423,7 @@ class SoundcloudUserIE(SoundcloudIE):
qs = compat_urlparse.parse_qs(parsed_next_href.query)
qs.update(COMMON_QUERY)
next_href = compat_urlparse.urlunparse(
parsed_next_href._replace(query=compat_urllib_parse.urlencode(qs, True)))
parsed_next_href._replace(query=compat_urllib_parse_urlencode(qs, True)))
return {
'_type': 'playlist',
@ -460,7 +459,7 @@ class SoundcloudPlaylistIE(SoundcloudIE):
if token:
data_dict['secret_token'] = token
data = compat_urllib_parse.urlencode(data_dict)
data = compat_urllib_parse_urlencode(data_dict)
data = self._download_json(
base_url + data, playlist_id, 'Downloading playlist')
@ -500,7 +499,8 @@ class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
query['client_id'] = self._CLIENT_ID
query['linked_partitioning'] = '1'
query['offset'] = 0
data = compat_urllib_parse.urlencode(encode_dict(query))
data = compat_urllib_parse_urlencode(query)
data = compat_urllib_parse_urlencode(query)
next_url = '{0}{1}?{2}'.format(self._API_V2_BASE, endpoint, data)
collected_results = 0